mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
This changeset contains all differences between xen-unstable.hg and xen-unstable-hvm.hg. All information and comments for changesets unique to xen-unstable-hvm.hg are included below. Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> Signed-off-by: Keir Fraser <keir@xensource.com> > user: leendert@eserver2.watson.ibm.com > date: Tue Jan 31 04:29:51 2006 -0400 > files: xen/include/asm-ia64/mm.h > description: > Fix ia64 compile. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Tue Jan 31 02:21:49 2006 -0400 > files: xen/include/xen/domain_page.h > description: > Eliminate unused fields (pfn,va) warnings. > > Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Fri Jan 27 04:31:44 2006 -0400 > files: tools/python/xen/xend/image.py > description: > Name cleanup. vmx refers to VT-x specific code, HVM is used for all others. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: root@xen-trw1.amd.com > date: Sun Jan 22 18:39:58 2006 -0500 > files: xen/arch/x86/hvm/platform.c > description: > support prefix 0x67 in hvm decode logic, gfxboot patch causes 0x67 prefix. > > > user: twoller@xen-trw1.amd.com > date: Sun Jan 22 18:35:59 2006 -0500 > files: xen/arch/x86/hvm/svm/svm.c xen/arch/x86/hvm/svm/vmcb.c xen/include/asm-x86/hvm/svm/svm.h > description: > check for valid shared_page_va/vmcb before deallocating in SVM. > > > user: leendert@eserver2.watson.ibm.com > date: Sun Jan 22 02:56:20 2006 -0400 > files: xen/include/asm-x86/hvm/svm/svm.h xen/include/asm-x86/hvm/svm/vmmcall.h > description: > Some SVM header file cleanups. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Fri Jan 20 11:50:23 2006 -0400 > files: xen/arch/x86/domain.c > description: > Need to be more diligent about when to call into the HVM abstraction layer > and when not. > > Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Wed Jan 18 15:14:56 2006 -0400 > files: xen/arch/x86/hvm/svm/svm.c xen/arch/x86/hvm/svm/x86_32/exits.S xen/arch/x86/hvm/svm/x86_64/exits.S xen/arch/x86/hvm/vmx/x86_32/exits.S xen/arch/x86/hvm/vmx/x86_64/exits.S > description: > Added missing copyright statements and updated svm.c's copyright to properly > reflect that it was derived from vmx.c. > > Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Tue Jan 17 09:42:11 2006 -0400 > files: xen/arch/ia64/Makefile xen/arch/ia64/vmx/vlsapic.c xen/arch/ia64/vmx/vmx_init.c xen/include/asm-ia64/vmx_platform.h > description: > Make sure ia64 builds again with the new directory structure. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@localhost.localdomain > date: Tue Jan 17 08:28:51 2006 -0400 > files: xen/arch/x86/Makefile xen/arch/x86/hvm/i8259.c xen/arch/x86/hvm/vioapic.c > description: > The device models now belong in hvm. > > Signed-ff-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Sun Jan 15 16:40:58 2006 -0400 > files: xen/arch/x86/Makefile xen/arch/x86/cpu/amd.c xen/arch/x86/cpu/intel.c xen/arch/x86/dm/hvm_vioapic.c xen/arch/x86/dm/i8259.c xen/arch/x86/dom0_ops.c xen/arch/x86/domain.c xen/arch/x86/hvm/hvm.c xen/arch/x86/hvm/intercept.c xen/arch/x86/hvm/io.c xen/arch/x86/hvm/platform.c xen/arch/x86/hvm/svm/emulate.c xen/arch/x86/hvm/svm/instrlen.c xen/arch/x86/hvm/svm/intr.c xen/arch/x86/hvm/svm/svm.c xen/arch/x86/hvm/svm/vmcb.c xen/arch/x86/hvm/svm/x86_32/exits.S xen/arch/x86/hvm/svm/x86_64/exits.S xen/arch/x86/hvm/vlapic.c xen/arch/x86/hvm/vmx/io.c xen/arch/x86/hvm/vmx/vmcs.c xen/arch/x86/hvm/vmx/vmx.c xen/arch/x86/hvm/vmx/x86_32/exits.S xen/arch/x86/hvm/vmx/x86_64/exits.S xen/arch/x86/i387.c xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_32/traps.c xen/arch/x86/x86_64/entry.S xen/arch/x86/x86_64/traps.c xen/include/asm-x86/domain.h xen/include/asm-x86/hvm/domain.h xen/include/asm-x86/hvm/hvm.h xen/include/asm-x86/hvm/io.h xen/include/asm-x86/hvm/support.h xen/include/asm-x86/hvm/svm/emulate.h xen/include/asm-x86/hvm/svm/intr.h xen/include/asm-x86/hvm/svm/svm.h xen/include/asm-x86/hvm/svm/vmcb.h xen/include/asm-x86/hvm/svm/vmmcall.h xen/include/asm-x86/hvm/vcpu.h xen/include/asm-x86/hvm/vioapic.h xen/include/asm-x86/hvm/vlapic.h xen/include/asm-x86/hvm/vmx/cpu.h xen/include/asm-x86/hvm/vmx/vmcs.h xen/include/asm-x86/hvm/vmx/vmx.h xen/include/asm-x86/hvm/vpic.h xen/include/asm-x86/hvm/vpit.h xen/include/asm-x86/shadow.h > description: > As suggested by Keir, I restructured the hvm/vmx/svm tree. The new > directory structure looks like: > > xen/arch/hvm/ > xen/arch/hvm/vmx > xen/arch/hvm/vmx/x86_32 > xen/arch/hvm/vmx/x86_64 > xen/arch/hvm/svm > xen/arch/hvm/svm/x86_32 > xen/arch/hvm/svm/x86_64 > > xen/include/hvm/ > xen/include/hvm/vmx > xen/include/hvm/svm > > Many files have been renamed and had their hvm_/vmx_/svm_ suffix removed > because this is now clear from the directory where the file resides. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Sat Jan 14 17:03:28 2006 -0400 > files: xen/arch/ia64/vmx/vlsapic.c xen/include/asm-ia64/vmx_platform.h > description: > Name change fix for ia64. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Sat Jan 14 15:12:59 2006 -0400 > files: xen/arch/x86/dm/hvm_vioapic.c xen/arch/x86/dm/i8259.c xen/arch/x86/hvm.c xen/arch/x86/hvm_intercept.c xen/arch/x86/svm.c xen/arch/x86/svm_intr.c xen/arch/x86/svm_vmcb.c xen/arch/x86/vmx.c xen/arch/x86/vmx_io.c xen/arch/x86/vmx_vmcs.c xen/include/asm-x86/hvm_domain.h xen/include/asm-x86/hvm_vcpu.h > description: > Move VMX/SVM print buffer to hvm_domain. > > Cleanup variable names. The suffix hvm_ is redundant in hvm_domain. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: twoller@xen-trw1.site > date: Fri Jan 13 17:03:18 2006 -0500 > files: xen/arch/x86/svm.c > description: > remove unnecessary spin_unlock in asid_fetch code for svm. > > > user: twoller@xen-trw1.site > date: Wed Jan 11 20:00:36 2006 -0500 > files: xen/arch/x86/svm.c > description: > remove unneeded update_pagetables() during svm PF handling (resolved with ASID code rework). > > > user: leendert@eserver2.watson.ibm.com > date: Tue Jan 10 02:45:32 2006 -0400 > files: xen/arch/x86/hvm.c xen/arch/x86/vmx_io.c > description: > Factor out cpu_get_interrupt(). It is used by VMX and SVM. > > Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Mon Jan 9 00:03:30 2006 -0400 > files: xen/arch/x86/hvm.c xen/arch/x86/svm.c xen/arch/x86/vmx.c xen/include/asm-x86/hvm_support.h xen/include/asm-x86/hvm_vcpu.h > description: > Introduce small print buffer per domain rather than a single global one. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Sun Jan 8 23:07:12 2006 -0400 > files: xen/arch/x86/dom0_ops.c xen/include/asm-x86/hvm_support.h xen/include/public/arch-x86_32.h xen/include/public/arch-x86_64.h > description: > More cleanup. There is no point in distinguishing between SVM and VMX, > a single HVM flag bit suffices. > > Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Sun Jan 8 12:05:59 2006 -0400 > files: xen/arch/x86/svm.c xen/arch/x86/vmx.c > description: > Both VMX & SVM now print writes to the debug port (0xE9) on the console. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Sat Jan 7 13:55:27 2006 -0400 > files: xen/arch/x86/svm.c xen/arch/x86/svm_intr.c xen/arch/x86/svm_vmcb.c xen/arch/x86/vmx.c xen/arch/x86/vmx_io.c xen/arch/x86/vmx_vmcs.c xen/arch/x86/x86_32/asm-offsets.c xen/arch/x86/x86_64/asm-offsets.c xen/include/asm-x86/domain.h xen/include/asm-x86/vmx.h > description: > Introduce shorthands to improve code legibility. > > Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Wed Jan 4 06:12:10 2006 -0400 > files: tools/examples/xmexample.hvm > description: > Minor spelling mistakes. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Wed Jan 4 03:37:55 2006 -0400 > files: xen/include/public/hvm/hvm_info_table.h xen/include/public/hvm/ioreq.h xen/include/public/hvm/vmx_assist.h > description: > Missed adding new files. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Mon Jan 2 01:23:54 2006 -0400 > files: tools/debugger/libxendebug/xendebug.c tools/libxc/xc_hvm_build.c > description: > Finalize Xin Li's patch: vmx/svm_identify is no longer necessary. > Xen debug should test for HVM instead of VMX. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: twoller@xen-trw1.site > date: Sun Jan 1 03:22:39 2006 -0500 > files: tools/ioemu/vl.c > description: > change hardcoded VTXEN to HVMXEN. > > > user: leendert@eserver2.watson.ibm.com > date: Sun Jan 1 02:22:47 2006 -0400 > files: tools/libxc/xc_hvm_build.c tools/python/xen/xend/image.py xen/arch/x86/domain.c > description: > Avoid xen crash if there is no VMX support. If a platform > doesn't support VMX, creating VMX domain will crash xen > HV. > > Signed-off-by: Xin Li <xin.b.li@intel.com> > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > [ vmx/svm_identify are still needed in hvm builder, but this may not > really be necessary. I need to check this. - lvd ] > > > user: twoller@xen-trw1.site > date: Fri Dec 30 21:38:56 2005 -0500 > files: xen/arch/x86/svm.c xen/arch/x86/svm_vmcb.c xen/arch/x86/x86_32/entry.S xen/include/asm-x86/svm.h xen/include/asm-x86/svm_vmcb.h > description: > add multi-core support for guest ASIDs for SVM partitions. > > > user: leendert@eserver2.watson.ibm.com > date: Sun Dec 25 20:44:43 2005 -0400 > files: tools/firmware/vmxassist/head.S > description: > Make sure vmxassist still works in its debug environment. > > Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Fri Dec 23 18:27:57 2005 -0400 > files: tools/libxc/xc_ia64_stubs.c > description: > Fixed libxc ia64, xend uses xc_hvm_build instead of xc_vmx_build. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: twoller@xen-trw1.site > date: Wed Dec 21 21:39:17 2005 -0500 > files: xen/arch/x86/svm_intr.c xen/arch/x86/svm_vmcb.c > description: > cleanup of svm specific code. > > > user: leendert@eserver2.watson.ibm.com > date: Wed Dec 21 17:18:25 2005 -0400 > files: tools/python/xen/xm/tests/test_create.py tools/xm-test/README > description: > Minor name cleanups. xm-test isn't VMX specific. Instead use HVM. > > > user: twoller@xen-trw1.site > date: Tue Dec 20 20:01:38 2005 -0500 > files: xen/arch/x86/svm_vmcb.c > description: > reword comments. > > > user: twoller@xen-trw1.site > date: Tue Dec 20 20:01:07 2005 -0500 > files: xen/arch/x86/svm_intr.c > description: > add additional VLAPIC delivery modes. > > > user: twoller@xen-trw1.site > date: Tue Dec 20 20:00:22 2005 -0500 > files: xen/arch/x86/svm.c > description: > reformat misaligned code. > > > user: twoller@xen-trw1.site > date: Tue Dec 20 19:59:37 2005 -0500 > files: xen/arch/x86/svm.c > description: > Add additional AMD SVM specific CPUID logic. > > > user: leendert@eserver2.watson.ibm.com > date: Thu Dec 15 03:06:15 2005 -0400 > files: tools/xm-test/tests/block-create/01_block_attach_device_pos.py tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py tools/xm-test/tests/block-create/12_block_attach_shared_domU.py tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py tools/xm-test/tests/block-list/01_block-list_pos.py tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py tools/xm-test/tests/block-list/04_block-list_nodb_pos.py tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py tools/xm-test/tests/memmax/01_memmax_badparm_neg.py tools/xm-test/tests/memset/01_memset_basic_pos.py tools/xm-test/tests/memset/02_memset_badparm_neg.py tools/xm-test/tests/memset/03_memset_random_pos.py tools/xm-test/tests/memset/04_memset_smallmem_pos.py tools/xm-test/tests/migrate/01_migrate_localhost_pos.py tools/xm-test/tests/network-attach/01_network_attach_pos.py tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py tools/xm-test/tests/restore/01_restore_basic_pos.py tools/xm-test/tests/restore/02_restore_badparm_neg.py tools/xm-test/tests/restore/03_restore_badfilename_neg.py tools/xm-test/tests/restore/04_restore_withdevices_pos.py tools/xm-test/tests/save/01_save_basic_pos.py tools/xm-test/tests/save/02_save_badparm_neg.py tools/xm-test/tests/save/03_save_bogusfile_neg.py tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py > description: > Adding SKIP() to tests that aren't supported for VMX domains. > > Signed-off-by: Dan Stekloff <dsteklof@us.ibm.com> > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Tue Dec 13 22:43:47 2005 -0400 > files: xen/arch/x86/svm.c xen/arch/x86/vmx.c xen/arch/x86/vmx_io.c xen/include/asm-x86/hvm_vpit.h xen/include/asm-x86/msr.h > description: > Support VMX guest accesses to IA32_TIME_STAMP_COUNTER MSR. > > Signed-off-by: Haifeng Xue <haifeng.xue@intel.com> > Signed-off-by: Leendert van Doorn <leendert@us.ibm.com> > > > user: twoller@xen-trw1.site > date: Tue Dec 13 19:49:53 2005 -0500 > files: xen/arch/x86/svm.c xen/arch/x86/svm_emulate.c xen/arch/x86/svm_instrlen.c xen/arch/x86/svm_intr.c xen/arch/x86/svm_vmcb.c xen/include/asm-x86/svm.h xen/include/asm-x86/svm_emulate.h xen/include/asm-x86/svm_intr.h xen/include/asm-x86/svm_vmcb.h xen/include/asm-x86/svm_vmmcall.h > description: > Add SVM base files to repository. > > > user: twoller@xen-trw1.site > date: Tue Dec 13 19:49:02 2005 -0500 > files: xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_64/entry.S > description: > Add SVM entry points for launch/resume. > > > user: twoller@xen-trw1.site > date: Tue Dec 13 19:47:38 2005 -0500 > files: .hgignore > description: > Add hvmloader files to ignore list. > > > user: leendert@eserver2.watson.ibm.com > date: Mon Dec 12 22:58:54 2005 -0400 > files: docs/src/user.tex tools/firmware/README xen/include/asm-x86/hvm.h > description: > Removed dirty words (by request). > > > user: leendert@eserver2.watson.ibm.com > date: Mon Dec 12 05:48:22 2005 -0400 > files: tools/firmware/hvmloader/mkhex > description: > Fix file mode. > > Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com> > > > user: leendert@eserver2.watson.ibm.com > date: Mon Dec 12 04:50:42 2005 -0400 > files: xen/Rules.mk xen/arch/x86/cpu/amd.c xen/arch/x86/cpu/intel.c xen/arch/x86/dm/hvm_vioapic.c xen/arch/x86/dm/i8259.c xen/arch/x86/dom0_ops.c xen/arch/x86/domain.c xen/arch/x86/hvm.c xen/arch/x86/hvm_intercept.c xen/arch/x86/hvm_io.c xen/arch/x86/hvm_platform.c xen/arch/x86/hvm_vlapic.c xen/arch/x86/mpparse.c xen/arch/x86/shadow.c xen/arch/x86/vmx.c xen/arch/x86/vmx_io.c xen/arch/x86/vmx_vmcs.c xen/arch/x86/x86_32/asm-offsets.c xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_64/asm-offsets.c xen/arch/x86/x86_64/entry.S xen/arch/x86/x86_64/mm.c xen/include/asm-x86/config.h xen/include/asm-x86/cpufeature.h xen/include/asm-x86/domain.h xen/include/asm-x86/hvm_domain.h xen/include/asm-x86/hvm_io.h xen/include/asm-x86/hvm_support.h xen/include/asm-x86/hvm_vcpu.h xen/include/asm-x86/hvm_vioapic.h xen/include/asm-x86/hvm_vlapic.h xen/include/asm-x86/hvm_vpic.h xen/include/asm-x86/hvm_vpit.h xen/include/asm-x86/mpspec.h xen/include/asm-x86/msr.h xen/include/asm-x86/processor.h xen/include/asm-x86/vmx.h xen/include/asm-x86/vmx_cpu.h xen/include/asm-x86/vmx_vmcs.h > description: > Phase 3 of HVM integration: This patchset introduces the refactoring of > virtualization architecture independent functions from specific ones. > > > user: leendert@eserver2.watson.ibm.com > date: Sun Dec 11 07:02:51 2005 -0400 > files: xen/arch/x86/dom0_ops.c xen/arch/x86/domain.c xen/arch/x86/i387.c xen/arch/x86/shadow.c xen/arch/x86/vmx.c xen/arch/x86/x86_32/traps.c xen/arch/x86/x86_64/traps.c xen/include/asm-x86/hvm.h xen/include/asm-x86/hvm_support.h xen/include/asm-x86/regs.h xen/include/asm-x86/shadow.h xen/include/asm-x86/vmx_vmcs.h > description: > Phase 2 of HVM integration: This patchset introduces the hvm interface > to the hypervisor and modifies all the non-vmx specific files to use it. > > > user: leendert@eserver2.watson.ibm.com > date: Sun Dec 11 01:10:00 2005 -0400 > files: tools/examples/Makefile tools/examples/README tools/examples/xmexample.hvm tools/ioemu/exec-all.h tools/ioemu/hw/i8254.c tools/ioemu/hw/i8259.c tools/ioemu/monitor.c tools/ioemu/target-i386-dm/helper2.c tools/ioemu/vl.c tools/libxc/Makefile tools/libxc/xc_hvm_build.c tools/libxc/xc_ptrace.c tools/libxc/xc_ptrace_core.c tools/libxc/xenguest.h tools/python/xen/lowlevel/xc/xc.c tools/python/xen/xend/image.py tools/python/xen/xm/create.py tools/xm-test/configure.ac tools/xm-test/lib/XmTestLib/XenDomain.py tools/xm-test/lib/XmTestLib/config.py.in tools/xm-test/ramdisk/Makefile.am tools/xm-test/ramdisk/bin/create_disk_image tools/xm-test/tests/block-list/04_block-list_nodb_pos.py xen/include/public/arch-x86_32.h xen/include/public/arch-x86_64.h > description: > Phase 1 of HVM integration: This patchset updates the tools. Most of the > tools are machine independent except for some detection code in the hvm > domain builder.
524 lines
14 KiB
C
524 lines
14 KiB
C
/*
|
|
* QEMU 8253/8254 interval timer emulation
|
|
*
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#include "vl.h"
|
|
#include <xenctrl.h>
|
|
#include <xen/hvm/ioreq.h>
|
|
|
|
//#define DEBUG_PIT
|
|
|
|
#define RW_STATE_LSB 1
|
|
#define RW_STATE_MSB 2
|
|
#define RW_STATE_WORD0 3
|
|
#define RW_STATE_WORD1 4
|
|
|
|
typedef struct PITChannelState {
|
|
int count; /* can be 65536 */
|
|
uint16_t latched_count;
|
|
uint8_t count_latched;
|
|
uint8_t status_latched;
|
|
uint8_t status;
|
|
uint8_t read_state;
|
|
uint8_t write_state;
|
|
uint8_t write_latch;
|
|
uint8_t rw_mode;
|
|
uint8_t mode;
|
|
uint8_t bcd; /* not supported */
|
|
uint8_t gate; /* timer start */
|
|
int64_t count_load_time;
|
|
/* irq handling */
|
|
int64_t next_transition_time;
|
|
QEMUTimer *irq_timer;
|
|
int irq;
|
|
int hvm_channel; /* Is this accelerated by HVM ? */
|
|
} PITChannelState;
|
|
|
|
struct PITState {
|
|
PITChannelState channels[3];
|
|
};
|
|
|
|
static PITState pit_state;
|
|
|
|
static void pit_irq_timer_update(PITChannelState *s, int64_t current_time);
|
|
|
|
/* currently operate which channel for hvm use */
|
|
int hvm_channel = -1;
|
|
extern FILE *logfile;
|
|
static int pit_get_count(PITChannelState *s)
|
|
{
|
|
uint64_t d;
|
|
int counter;
|
|
|
|
d = muldiv64(qemu_get_clock(vm_clock) - s->count_load_time, PIT_FREQ, ticks_per_sec);
|
|
switch(s->mode) {
|
|
case 0:
|
|
case 1:
|
|
case 4:
|
|
case 5:
|
|
counter = (s->count - d) & 0xffff;
|
|
break;
|
|
case 3:
|
|
/* XXX: may be incorrect for odd counts */
|
|
counter = s->count - ((2 * d) % s->count);
|
|
break;
|
|
default:
|
|
counter = s->count - (d % s->count);
|
|
break;
|
|
}
|
|
return counter;
|
|
}
|
|
|
|
/* get pit output bit */
|
|
static int pit_get_out1(PITChannelState *s, int64_t current_time)
|
|
{
|
|
uint64_t d;
|
|
int out;
|
|
|
|
d = muldiv64(current_time - s->count_load_time, PIT_FREQ, ticks_per_sec);
|
|
switch(s->mode) {
|
|
default:
|
|
case 0:
|
|
out = (d >= s->count);
|
|
break;
|
|
case 1:
|
|
out = (d < s->count);
|
|
break;
|
|
case 2:
|
|
if ((d % s->count) == 0 && d != 0)
|
|
out = 1;
|
|
else
|
|
out = 0;
|
|
break;
|
|
case 3:
|
|
out = (d % s->count) < ((s->count + 1) >> 1);
|
|
break;
|
|
case 4:
|
|
case 5:
|
|
out = (d == s->count);
|
|
break;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
int pit_get_out(PITState *pit, int channel, int64_t current_time)
|
|
{
|
|
PITChannelState *s = &pit->channels[channel];
|
|
return pit_get_out1(s, current_time);
|
|
}
|
|
|
|
/* return -1 if no transition will occur. */
|
|
static int64_t pit_get_next_transition_time(PITChannelState *s,
|
|
int64_t current_time)
|
|
{
|
|
uint64_t d, next_time, base;
|
|
int period2;
|
|
|
|
d = muldiv64(current_time - s->count_load_time, PIT_FREQ, ticks_per_sec);
|
|
switch(s->mode) {
|
|
default:
|
|
case 0:
|
|
case 1:
|
|
if (d < s->count)
|
|
next_time = s->count;
|
|
else
|
|
return -1;
|
|
break;
|
|
case 2:
|
|
base = (d / s->count) * s->count;
|
|
if ((d - base) == 0 && d != 0)
|
|
next_time = base + s->count;
|
|
else
|
|
next_time = base + s->count + 1;
|
|
break;
|
|
case 3:
|
|
base = (d / s->count) * s->count;
|
|
period2 = ((s->count + 1) >> 1);
|
|
if ((d - base) < period2)
|
|
next_time = base + period2;
|
|
else
|
|
next_time = base + s->count;
|
|
break;
|
|
case 4:
|
|
case 5:
|
|
if (d < s->count)
|
|
next_time = s->count;
|
|
else if (d == s->count)
|
|
next_time = s->count + 1;
|
|
else
|
|
return -1;
|
|
break;
|
|
}
|
|
/* convert to timer units */
|
|
next_time = s->count_load_time + muldiv64(next_time, ticks_per_sec, PIT_FREQ);
|
|
/* fix potential rounding problems */
|
|
/* XXX: better solution: use a clock at PIT_FREQ Hz */
|
|
if (next_time <= current_time)
|
|
next_time = current_time + 1;
|
|
return next_time;
|
|
}
|
|
|
|
/* val must be 0 or 1 */
|
|
void pit_set_gate(PITState *pit, int channel, int val)
|
|
{
|
|
PITChannelState *s = &pit->channels[channel];
|
|
|
|
switch(s->mode) {
|
|
default:
|
|
case 0:
|
|
case 4:
|
|
/* XXX: just disable/enable counting */
|
|
break;
|
|
case 1:
|
|
case 5:
|
|
if (s->gate < val) {
|
|
/* restart counting on rising edge */
|
|
s->count_load_time = qemu_get_clock(vm_clock);
|
|
pit_irq_timer_update(s, s->count_load_time);
|
|
}
|
|
break;
|
|
case 2:
|
|
case 3:
|
|
if (s->gate < val) {
|
|
/* restart counting on rising edge */
|
|
s->count_load_time = qemu_get_clock(vm_clock);
|
|
pit_irq_timer_update(s, s->count_load_time);
|
|
}
|
|
/* XXX: disable/enable counting */
|
|
break;
|
|
}
|
|
s->gate = val;
|
|
}
|
|
|
|
int pit_get_gate(PITState *pit, int channel)
|
|
{
|
|
PITChannelState *s = &pit->channels[channel];
|
|
return s->gate;
|
|
}
|
|
|
|
void pit_reset_hvm_vectors()
|
|
{
|
|
extern shared_iopage_t *shared_page;
|
|
ioreq_t *req;
|
|
int irq, i;
|
|
PITChannelState *s;
|
|
|
|
irq = 0;
|
|
|
|
for(i = 0; i < 3; i++) {
|
|
if (pit_state.channels[i].hvm_channel)
|
|
break;
|
|
}
|
|
|
|
if (i == 3)
|
|
return;
|
|
|
|
/* Assumes just one HVM accelerated channel */
|
|
hvm_channel = i;
|
|
s = &pit_state.channels[hvm_channel];
|
|
fprintf(logfile,
|
|
"HVM_PIT:guest init pit channel %d!\n", hvm_channel);
|
|
req = &shared_page->vcpu_iodata[0].vp_ioreq;
|
|
|
|
req->state = STATE_IORESP_HOOK;
|
|
/*
|
|
* info passed to HV as following
|
|
* -- init count:16 bit, timer vec:8 bit,
|
|
* PIT channel(0~2):2 bit, rw mode:2 bit
|
|
*/
|
|
req->u.data = s->count;
|
|
req->u.data |= (irq << 16);
|
|
req->u.data |= (hvm_channel << 24);
|
|
req->u.data |= ((s->rw_mode) << 26);
|
|
fprintf(logfile, "HVM_PIT:pass info 0x%llx to HV!\n", req->u.data);
|
|
}
|
|
|
|
static inline void pit_load_count(PITChannelState *s, int val)
|
|
{
|
|
if (val == 0)
|
|
val = 0x10000;
|
|
s->count_load_time = qemu_get_clock(vm_clock);
|
|
s->count = val;
|
|
|
|
/* guest init this pit channel for periodic mode. we do not update related
|
|
* timer so the channel never send intr from device model*/
|
|
if (hvm_channel != -1 && s->mode == 2) {
|
|
pit_reset_hvm_vectors();
|
|
hvm_channel = -1;
|
|
}
|
|
|
|
/* pit_irq_timer_update(s, s->count_load_time);*/
|
|
}
|
|
|
|
/* if already latched, do not latch again */
|
|
static void pit_latch_count(PITChannelState *s)
|
|
{
|
|
if (!s->count_latched) {
|
|
s->latched_count = pit_get_count(s);
|
|
s->count_latched = s->rw_mode;
|
|
}
|
|
}
|
|
|
|
static void pit_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
|
{
|
|
PITState *pit = opaque;
|
|
int channel, access;
|
|
PITChannelState *s;
|
|
|
|
addr &= 3;
|
|
if (addr == 3) {
|
|
channel = val >> 6;
|
|
if (channel == 3) {
|
|
/* read back command */
|
|
for(channel = 0; channel < 3; channel++) {
|
|
s = &pit->channels[channel];
|
|
if (val & (2 << channel)) {
|
|
if (!(val & 0x20)) {
|
|
pit_latch_count(s);
|
|
}
|
|
if (!(val & 0x10) && !s->status_latched) {
|
|
/* status latch */
|
|
/* XXX: add BCD and null count */
|
|
s->status = (pit_get_out1(s, qemu_get_clock(vm_clock)) << 7) |
|
|
(s->rw_mode << 4) |
|
|
(s->mode << 1) |
|
|
s->bcd;
|
|
s->status_latched = 1;
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
s = &pit->channels[channel];
|
|
access = (val >> 4) & 3;
|
|
if (access == 0) {
|
|
pit_latch_count(s);
|
|
} else {
|
|
s->rw_mode = access;
|
|
s->read_state = access;
|
|
s->write_state = access;
|
|
|
|
s->mode = (val >> 1) & 7;
|
|
s->bcd = val & 1;
|
|
/* XXX: update irq timer ? */
|
|
}
|
|
}
|
|
} else {
|
|
s = &pit->channels[addr];
|
|
s->hvm_channel = 1;
|
|
hvm_channel = addr;
|
|
switch(s->write_state) {
|
|
default:
|
|
case RW_STATE_LSB:
|
|
pit_load_count(s, val);
|
|
break;
|
|
case RW_STATE_MSB:
|
|
pit_load_count(s, val << 8);
|
|
break;
|
|
case RW_STATE_WORD0:
|
|
s->write_latch = val;
|
|
s->write_state = RW_STATE_WORD1;
|
|
break;
|
|
case RW_STATE_WORD1:
|
|
pit_load_count(s, s->write_latch | (val << 8));
|
|
s->write_state = RW_STATE_WORD0;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
static uint32_t pit_ioport_read(void *opaque, uint32_t addr)
|
|
{
|
|
PITState *pit = opaque;
|
|
int ret, count;
|
|
PITChannelState *s;
|
|
|
|
addr &= 3;
|
|
s = &pit->channels[addr];
|
|
if (s->status_latched) {
|
|
s->status_latched = 0;
|
|
ret = s->status;
|
|
} else if (s->count_latched) {
|
|
switch(s->count_latched) {
|
|
default:
|
|
case RW_STATE_LSB:
|
|
ret = s->latched_count & 0xff;
|
|
s->count_latched = 0;
|
|
break;
|
|
case RW_STATE_MSB:
|
|
ret = s->latched_count >> 8;
|
|
s->count_latched = 0;
|
|
break;
|
|
case RW_STATE_WORD0:
|
|
ret = s->latched_count & 0xff;
|
|
s->count_latched = RW_STATE_MSB;
|
|
break;
|
|
}
|
|
} else {
|
|
switch(s->read_state) {
|
|
default:
|
|
case RW_STATE_LSB:
|
|
count = pit_get_count(s);
|
|
ret = count & 0xff;
|
|
break;
|
|
case RW_STATE_MSB:
|
|
count = pit_get_count(s);
|
|
ret = (count >> 8) & 0xff;
|
|
break;
|
|
case RW_STATE_WORD0:
|
|
count = pit_get_count(s);
|
|
ret = count & 0xff;
|
|
s->read_state = RW_STATE_WORD1;
|
|
break;
|
|
case RW_STATE_WORD1:
|
|
count = pit_get_count(s);
|
|
ret = (count >> 8) & 0xff;
|
|
s->read_state = RW_STATE_WORD0;
|
|
break;
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static void pit_irq_timer_update(PITChannelState *s, int64_t current_time)
|
|
{
|
|
int64_t expire_time;
|
|
int irq_level;
|
|
|
|
if (!s->irq_timer)
|
|
return;
|
|
expire_time = pit_get_next_transition_time(s, current_time);
|
|
irq_level = pit_get_out1(s, current_time);
|
|
pic_set_irq(s->irq, irq_level);
|
|
#ifdef DEBUG_PIT
|
|
printf("irq_level=%d next_delay=%f\n",
|
|
irq_level,
|
|
(double)(expire_time - current_time) / ticks_per_sec);
|
|
#endif
|
|
s->next_transition_time = expire_time;
|
|
if (expire_time != -1)
|
|
qemu_mod_timer(s->irq_timer, expire_time);
|
|
else
|
|
qemu_del_timer(s->irq_timer);
|
|
}
|
|
|
|
static void pit_irq_timer(void *opaque)
|
|
{
|
|
PITChannelState *s = opaque;
|
|
|
|
pit_irq_timer_update(s, s->next_transition_time);
|
|
}
|
|
|
|
static void pit_save(QEMUFile *f, void *opaque)
|
|
{
|
|
PITState *pit = opaque;
|
|
PITChannelState *s;
|
|
int i;
|
|
|
|
for(i = 0; i < 3; i++) {
|
|
s = &pit->channels[i];
|
|
qemu_put_be32s(f, &s->count);
|
|
qemu_put_be16s(f, &s->latched_count);
|
|
qemu_put_8s(f, &s->count_latched);
|
|
qemu_put_8s(f, &s->status_latched);
|
|
qemu_put_8s(f, &s->status);
|
|
qemu_put_8s(f, &s->read_state);
|
|
qemu_put_8s(f, &s->write_state);
|
|
qemu_put_8s(f, &s->write_latch);
|
|
qemu_put_8s(f, &s->rw_mode);
|
|
qemu_put_8s(f, &s->mode);
|
|
qemu_put_8s(f, &s->bcd);
|
|
qemu_put_8s(f, &s->gate);
|
|
qemu_put_be64s(f, &s->count_load_time);
|
|
if (s->irq_timer) {
|
|
qemu_put_be64s(f, &s->next_transition_time);
|
|
qemu_put_timer(f, s->irq_timer);
|
|
}
|
|
}
|
|
}
|
|
|
|
static int pit_load(QEMUFile *f, void *opaque, int version_id)
|
|
{
|
|
PITState *pit = opaque;
|
|
PITChannelState *s;
|
|
int i;
|
|
|
|
if (version_id != 1)
|
|
return -EINVAL;
|
|
|
|
for(i = 0; i < 3; i++) {
|
|
s = &pit->channels[i];
|
|
qemu_get_be32s(f, &s->count);
|
|
qemu_get_be16s(f, &s->latched_count);
|
|
qemu_get_8s(f, &s->count_latched);
|
|
qemu_get_8s(f, &s->status_latched);
|
|
qemu_get_8s(f, &s->status);
|
|
qemu_get_8s(f, &s->read_state);
|
|
qemu_get_8s(f, &s->write_state);
|
|
qemu_get_8s(f, &s->write_latch);
|
|
qemu_get_8s(f, &s->rw_mode);
|
|
qemu_get_8s(f, &s->mode);
|
|
qemu_get_8s(f, &s->bcd);
|
|
qemu_get_8s(f, &s->gate);
|
|
qemu_get_be64s(f, &s->count_load_time);
|
|
if (s->irq_timer) {
|
|
qemu_get_be64s(f, &s->next_transition_time);
|
|
qemu_get_timer(f, s->irq_timer);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void pit_reset(void *opaque)
|
|
{
|
|
PITState *pit = opaque;
|
|
PITChannelState *s;
|
|
int i;
|
|
|
|
for(i = 0;i < 3; i++) {
|
|
s = &pit->channels[i];
|
|
s->mode = 3;
|
|
s->gate = (i != 2);
|
|
pit_load_count(s, 0);
|
|
}
|
|
}
|
|
|
|
PITState *pit_init(int base, int irq)
|
|
{
|
|
PITState *pit = &pit_state;
|
|
PITChannelState *s;
|
|
|
|
s = &pit->channels[0];
|
|
/* the timer 0 is connected to an IRQ */
|
|
s->irq_timer = qemu_new_timer(vm_clock, pit_irq_timer, s);
|
|
s->irq = irq;
|
|
|
|
register_savevm("i8254", base, 1, pit_save, pit_load, pit);
|
|
|
|
qemu_register_reset(pit_reset, pit);
|
|
register_ioport_write(base, 4, 1, pit_ioport_write, pit);
|
|
register_ioport_read(base, 3, 1, pit_ioport_read, pit);
|
|
|
|
pit_reset(pit);
|
|
|
|
return pit;
|
|
}
|