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.
564 lines
15 KiB
C
564 lines
15 KiB
C
/*
|
|
* QEMU 8259 interrupt controller 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>
|
|
|
|
/* debug PIC */
|
|
//#define DEBUG_PIC
|
|
|
|
//#define DEBUG_IRQ_LATENCY
|
|
//#define DEBUG_IRQ_COUNT
|
|
|
|
extern void pit_reset_hvm_vectors();
|
|
|
|
typedef struct PicState {
|
|
uint8_t last_irr; /* edge detection */
|
|
uint8_t irr; /* interrupt request register */
|
|
uint8_t imr; /* interrupt mask register */
|
|
uint8_t isr; /* interrupt service register */
|
|
uint8_t priority_add; /* highest irq priority */
|
|
uint8_t irq_base;
|
|
uint8_t read_reg_select;
|
|
uint8_t poll;
|
|
uint8_t special_mask;
|
|
uint8_t init_state;
|
|
uint8_t auto_eoi;
|
|
uint8_t rotate_on_auto_eoi;
|
|
uint8_t special_fully_nested_mode;
|
|
uint8_t init4; /* true if 4 byte init */
|
|
uint8_t elcr; /* PIIX edge/trigger selection*/
|
|
uint8_t elcr_mask;
|
|
} PicState;
|
|
|
|
/* 0 is master pic, 1 is slave pic */
|
|
static PicState pics[2];
|
|
|
|
#if defined(DEBUG_PIC) || defined (DEBUG_IRQ_COUNT)
|
|
static int irq_level[16];
|
|
#endif
|
|
#ifdef DEBUG_IRQ_COUNT
|
|
static uint64_t irq_count[16];
|
|
#endif
|
|
|
|
/* set irq level. If an edge is detected, then the IRR is set to 1 */
|
|
static inline void pic_set_irq1(PicState *s, int irq, int level)
|
|
{
|
|
int mask;
|
|
mask = 1 << irq;
|
|
if (s->elcr & mask) {
|
|
/* level triggered */
|
|
if (level) {
|
|
s->irr |= mask;
|
|
s->last_irr |= mask;
|
|
} else {
|
|
s->irr &= ~mask;
|
|
s->last_irr &= ~mask;
|
|
}
|
|
} else {
|
|
/* edge triggered */
|
|
if (level) {
|
|
if ((s->last_irr & mask) == 0)
|
|
s->irr |= mask;
|
|
s->last_irr |= mask;
|
|
} else {
|
|
s->last_irr &= ~mask;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* return the highest priority found in mask (highest = smallest
|
|
number). Return 8 if no irq */
|
|
static inline int get_priority(PicState *s, int mask)
|
|
{
|
|
int priority;
|
|
if (mask == 0)
|
|
return 8;
|
|
priority = 0;
|
|
while ((mask & (1 << ((priority + s->priority_add) & 7))) == 0)
|
|
priority++;
|
|
return priority;
|
|
}
|
|
|
|
/* return the pic wanted interrupt. return -1 if none */
|
|
static int pic_get_irq(PicState *s)
|
|
{
|
|
int mask, cur_priority, priority;
|
|
|
|
mask = s->irr & ~s->imr;
|
|
priority = get_priority(s, mask);
|
|
if (priority == 8)
|
|
return -1;
|
|
/* compute current priority. If special fully nested mode on the
|
|
master, the IRQ coming from the slave is not taken into account
|
|
for the priority computation. */
|
|
mask = s->isr;
|
|
if (s->special_fully_nested_mode && s == &pics[0])
|
|
mask &= ~(1 << 2);
|
|
cur_priority = get_priority(s, mask);
|
|
if (priority < cur_priority) {
|
|
/* higher priority found: an irq should be generated */
|
|
return (priority + s->priority_add) & 7;
|
|
} else {
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/* pic[1] is connected to pin2 of pic[0] */
|
|
#define CASCADE_IRQ 2
|
|
|
|
extern shared_iopage_t *shared_page;
|
|
|
|
static void xen_update_shared_imr(void)
|
|
{
|
|
uint8_t *pmask = (uint8_t *)shared_page->sp_global.pic_mask;
|
|
int index;
|
|
|
|
index = pics[0].irq_base/8;
|
|
pmask[index] = pics[0].imr;
|
|
|
|
index = pics[1].irq_base/8;
|
|
pmask[index] = (pics[0].imr & (1 << CASCADE_IRQ)) ? 0xff : pics[1].imr;
|
|
}
|
|
|
|
static void xen_clear_shared_irr(void)
|
|
{
|
|
memset(shared_page->sp_global.pic_intr, 0, INTR_LEN);
|
|
}
|
|
|
|
/* raise irq to CPU if necessary. must be called every time the active
|
|
irq may change */
|
|
static void pic_update_irq(void)
|
|
{
|
|
int irq2, irq;
|
|
|
|
/* first look at slave pic */
|
|
irq2 = pic_get_irq(&pics[1]);
|
|
if (irq2 >= 0) {
|
|
/* if irq request by slave pic, signal master PIC */
|
|
pic_set_irq1(&pics[0], 2, 1);
|
|
pic_set_irq1(&pics[0], 2, 0);
|
|
}
|
|
/* look at requested irq */
|
|
irq = pic_get_irq(&pics[0]);
|
|
if (irq >= 0) {
|
|
#if defined(DEBUG_PIC)
|
|
{
|
|
int i;
|
|
for(i = 0; i < 2; i++) {
|
|
printf("pic%d: imr=%x irr=%x padd=%d\n",
|
|
i, pics[i].imr, pics[i].irr, pics[i].priority_add);
|
|
|
|
}
|
|
}
|
|
printf("pic: cpu_interrupt\n");
|
|
#endif
|
|
cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HARD);
|
|
}
|
|
|
|
xen_update_shared_imr();
|
|
}
|
|
|
|
#ifdef DEBUG_IRQ_LATENCY
|
|
int64_t irq_time[16];
|
|
#endif
|
|
|
|
extern void ioapic_legacy_irq(int irq, int level);
|
|
|
|
void pic_set_irq(int irq, int level)
|
|
{
|
|
ioapic_legacy_irq(irq, level);
|
|
#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT)
|
|
if (level != irq_level[irq]) {
|
|
#if defined(DEBUG_PIC)
|
|
printf("pic_set_irq: irq=%d level=%d\n", irq, level);
|
|
#endif
|
|
irq_level[irq] = level;
|
|
#ifdef DEBUG_IRQ_COUNT
|
|
if (level == 1)
|
|
irq_count[irq]++;
|
|
#endif
|
|
}
|
|
#endif
|
|
#ifdef DEBUG_IRQ_LATENCY
|
|
if (level) {
|
|
irq_time[irq] = qemu_get_clock(vm_clock);
|
|
}
|
|
#endif
|
|
pic_set_irq1(&pics[irq >> 3], irq & 7, level);
|
|
pic_update_irq();
|
|
}
|
|
|
|
/* acknowledge interrupt 'irq' */
|
|
static inline void pic_intack(PicState *s, int irq)
|
|
{
|
|
if (s->auto_eoi) {
|
|
if (s->rotate_on_auto_eoi)
|
|
s->priority_add = (irq + 1) & 7;
|
|
} else {
|
|
s->isr |= (1 << irq);
|
|
}
|
|
/* We don't clear a level sensitive interrupt here */
|
|
if (!(s->elcr & (1 << irq)))
|
|
s->irr &= ~(1 << irq);
|
|
}
|
|
|
|
int cpu_get_pic_interrupt(CPUState *env)
|
|
{
|
|
int irq, irq2, intno;
|
|
|
|
/* read the irq from the PIC */
|
|
|
|
irq = pic_get_irq(&pics[0]);
|
|
if (irq >= 0) {
|
|
pic_intack(&pics[0], irq);
|
|
if (irq == 2) {
|
|
irq2 = pic_get_irq(&pics[1]);
|
|
if (irq2 >= 0) {
|
|
pic_intack(&pics[1], irq2);
|
|
} else {
|
|
/* spurious IRQ on slave controller */
|
|
irq2 = 7;
|
|
}
|
|
intno = pics[1].irq_base + irq2;
|
|
irq = irq2 + 8;
|
|
} else {
|
|
intno = pics[0].irq_base + irq;
|
|
}
|
|
} else {
|
|
/* spurious IRQ on host controller */
|
|
irq = 7;
|
|
intno = pics[0].irq_base + irq;
|
|
}
|
|
pic_update_irq();
|
|
|
|
#ifdef DEBUG_IRQ_LATENCY
|
|
printf("IRQ%d latency=%0.3fus\n",
|
|
irq,
|
|
(double)(qemu_get_clock(vm_clock) - irq_time[irq]) * 1000000.0 / ticks_per_sec);
|
|
#endif
|
|
#if defined(DEBUG_PIC)
|
|
printf("pic_interrupt: irq=%d\n", irq);
|
|
#endif
|
|
return intno;
|
|
}
|
|
|
|
int pic_irq2vec(int irq)
|
|
{
|
|
int vector = -1;
|
|
|
|
if (irq >= 8 && irq <= 15) {
|
|
if (pics[1].irq_base != 0xFF)
|
|
vector = pics[1].irq_base + irq;
|
|
} else if (irq != 2 && irq <= 7) {
|
|
if (pics[0].irq_base != 0xFF)
|
|
vector = pics[0].irq_base + irq;
|
|
}
|
|
return vector;
|
|
}
|
|
|
|
static void pic_reset(void *opaque)
|
|
{
|
|
PicState *s = opaque;
|
|
int tmp;
|
|
|
|
tmp = s->elcr_mask;
|
|
memset(s, 0, sizeof(PicState));
|
|
s->elcr_mask = tmp;
|
|
|
|
xen_update_shared_imr();
|
|
xen_clear_shared_irr();
|
|
}
|
|
|
|
static void pic_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
|
{
|
|
PicState *s = opaque;
|
|
int priority, cmd, irq;
|
|
|
|
#ifdef DEBUG_PIC
|
|
printf("pic_write: addr=0x%02x val=0x%02x\n", addr, val);
|
|
#endif
|
|
addr &= 1;
|
|
if (addr == 0) {
|
|
if (val & 0x10) {
|
|
/* init */
|
|
pic_reset(s);
|
|
/* deassert a pending interrupt */
|
|
cpu_reset_interrupt(cpu_single_env, CPU_INTERRUPT_HARD);
|
|
|
|
s->init_state = 1;
|
|
s->init4 = val & 1;
|
|
if (val & 0x02)
|
|
hw_error("single mode not supported");
|
|
if (val & 0x08)
|
|
hw_error("level sensitive irq not supported");
|
|
} else if (val & 0x08) {
|
|
if (val & 0x04)
|
|
s->poll = 1;
|
|
if (val & 0x02)
|
|
s->read_reg_select = val & 1;
|
|
if (val & 0x40)
|
|
s->special_mask = (val >> 5) & 1;
|
|
} else {
|
|
cmd = val >> 5;
|
|
switch(cmd) {
|
|
case 0:
|
|
case 4:
|
|
s->rotate_on_auto_eoi = cmd >> 2;
|
|
break;
|
|
case 1: /* end of interrupt */
|
|
case 5:
|
|
priority = get_priority(s, s->isr);
|
|
if (priority != 8) {
|
|
irq = (priority + s->priority_add) & 7;
|
|
s->isr &= ~(1 << irq);
|
|
if (cmd == 5)
|
|
s->priority_add = (irq + 1) & 7;
|
|
pic_update_irq();
|
|
}
|
|
break;
|
|
case 3:
|
|
irq = val & 7;
|
|
s->isr &= ~(1 << irq);
|
|
pic_update_irq();
|
|
break;
|
|
case 6:
|
|
s->priority_add = (val + 1) & 7;
|
|
pic_update_irq();
|
|
break;
|
|
case 7:
|
|
irq = val & 7;
|
|
s->isr &= ~(1 << irq);
|
|
s->priority_add = (irq + 1) & 7;
|
|
pic_update_irq();
|
|
break;
|
|
default:
|
|
/* no operation */
|
|
break;
|
|
}
|
|
}
|
|
} else {
|
|
switch(s->init_state) {
|
|
case 0:
|
|
/* normal mode */
|
|
s->imr = val;
|
|
pic_update_irq();
|
|
break;
|
|
case 1:
|
|
s->irq_base = val & 0xf8;
|
|
s->init_state = 2;
|
|
pit_reset_hvm_vectors();
|
|
break;
|
|
case 2:
|
|
if (s->init4) {
|
|
s->init_state = 3;
|
|
} else {
|
|
s->init_state = 0;
|
|
}
|
|
break;
|
|
case 3:
|
|
s->special_fully_nested_mode = (val >> 4) & 1;
|
|
s->auto_eoi = (val >> 1) & 1;
|
|
s->init_state = 0;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
static uint32_t pic_poll_read (PicState *s, uint32_t addr1)
|
|
{
|
|
int ret;
|
|
|
|
ret = pic_get_irq(s);
|
|
if (ret >= 0) {
|
|
if (addr1 >> 7) {
|
|
pics[0].isr &= ~(1 << 2);
|
|
pics[0].irr &= ~(1 << 2);
|
|
}
|
|
s->irr &= ~(1 << ret);
|
|
s->isr &= ~(1 << ret);
|
|
if (addr1 >> 7 || ret != 2)
|
|
pic_update_irq();
|
|
} else {
|
|
ret = 0x07;
|
|
pic_update_irq();
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static uint32_t pic_ioport_read(void *opaque, uint32_t addr1)
|
|
{
|
|
PicState *s = opaque;
|
|
unsigned int addr;
|
|
int ret;
|
|
|
|
addr = addr1;
|
|
addr &= 1;
|
|
if (s->poll) {
|
|
ret = pic_poll_read(s, addr1);
|
|
s->poll = 0;
|
|
} else {
|
|
if (addr == 0) {
|
|
if (s->read_reg_select)
|
|
ret = s->isr;
|
|
else
|
|
ret = s->irr;
|
|
} else {
|
|
ret = s->imr;
|
|
}
|
|
}
|
|
#ifdef DEBUG_PIC
|
|
printf("pic_read: addr=0x%02x val=0x%02x\n", addr1, ret);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
/* memory mapped interrupt status */
|
|
uint32_t pic_intack_read(CPUState *env)
|
|
{
|
|
int ret;
|
|
|
|
ret = pic_poll_read(&pics[0], 0x00);
|
|
if (ret == 2)
|
|
ret = pic_poll_read(&pics[1], 0x80) + 8;
|
|
/* Prepare for ISR read */
|
|
pics[0].read_reg_select = 1;
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void elcr_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
|
{
|
|
PicState *s = opaque;
|
|
s->elcr = val & s->elcr_mask;
|
|
}
|
|
|
|
static uint32_t elcr_ioport_read(void *opaque, uint32_t addr1)
|
|
{
|
|
PicState *s = opaque;
|
|
return s->elcr;
|
|
}
|
|
|
|
static void pic_save(QEMUFile *f, void *opaque)
|
|
{
|
|
PicState *s = opaque;
|
|
|
|
qemu_put_8s(f, &s->last_irr);
|
|
qemu_put_8s(f, &s->irr);
|
|
qemu_put_8s(f, &s->imr);
|
|
qemu_put_8s(f, &s->isr);
|
|
qemu_put_8s(f, &s->priority_add);
|
|
qemu_put_8s(f, &s->irq_base);
|
|
qemu_put_8s(f, &s->read_reg_select);
|
|
qemu_put_8s(f, &s->poll);
|
|
qemu_put_8s(f, &s->special_mask);
|
|
qemu_put_8s(f, &s->init_state);
|
|
qemu_put_8s(f, &s->auto_eoi);
|
|
qemu_put_8s(f, &s->rotate_on_auto_eoi);
|
|
qemu_put_8s(f, &s->special_fully_nested_mode);
|
|
qemu_put_8s(f, &s->init4);
|
|
qemu_put_8s(f, &s->elcr);
|
|
}
|
|
|
|
static int pic_load(QEMUFile *f, void *opaque, int version_id)
|
|
{
|
|
PicState *s = opaque;
|
|
|
|
if (version_id != 1)
|
|
return -EINVAL;
|
|
|
|
qemu_get_8s(f, &s->last_irr);
|
|
qemu_get_8s(f, &s->irr);
|
|
qemu_get_8s(f, &s->imr);
|
|
qemu_get_8s(f, &s->isr);
|
|
qemu_get_8s(f, &s->priority_add);
|
|
qemu_get_8s(f, &s->irq_base);
|
|
qemu_get_8s(f, &s->read_reg_select);
|
|
qemu_get_8s(f, &s->poll);
|
|
qemu_get_8s(f, &s->special_mask);
|
|
qemu_get_8s(f, &s->init_state);
|
|
qemu_get_8s(f, &s->auto_eoi);
|
|
qemu_get_8s(f, &s->rotate_on_auto_eoi);
|
|
qemu_get_8s(f, &s->special_fully_nested_mode);
|
|
qemu_get_8s(f, &s->init4);
|
|
qemu_get_8s(f, &s->elcr);
|
|
return 0;
|
|
}
|
|
|
|
/* XXX: add generic master/slave system */
|
|
static void pic_init1(int io_addr, int elcr_addr, PicState *s)
|
|
{
|
|
register_ioport_write(io_addr, 2, 1, pic_ioport_write, s);
|
|
register_ioport_read(io_addr, 2, 1, pic_ioport_read, s);
|
|
if (elcr_addr >= 0) {
|
|
register_ioport_write(elcr_addr, 1, 1, elcr_ioport_write, s);
|
|
register_ioport_read(elcr_addr, 1, 1, elcr_ioport_read, s);
|
|
}
|
|
register_savevm("i8259", io_addr, 1, pic_save, pic_load, s);
|
|
qemu_register_reset(pic_reset, s);
|
|
}
|
|
|
|
void pic_info(void)
|
|
{
|
|
int i;
|
|
PicState *s;
|
|
|
|
for(i=0;i<2;i++) {
|
|
s = &pics[i];
|
|
term_printf("pic%d: irr=%02x imr=%02x isr=%02x hprio=%d irq_base=%02x rr_sel=%d elcr=%02x fnm=%d\n",
|
|
i, s->irr, s->imr, s->isr, s->priority_add,
|
|
s->irq_base, s->read_reg_select, s->elcr,
|
|
s->special_fully_nested_mode);
|
|
}
|
|
}
|
|
|
|
void irq_info(void)
|
|
{
|
|
#ifndef DEBUG_IRQ_COUNT
|
|
term_printf("irq statistic code not compiled.\n");
|
|
#else
|
|
int i;
|
|
int64_t count;
|
|
|
|
term_printf("IRQ statistics:\n");
|
|
for (i = 0; i < 16; i++) {
|
|
count = irq_count[i];
|
|
if (count > 0)
|
|
term_printf("%2d: %lld\n", i, count);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void pic_init(void)
|
|
{
|
|
pic_init1(0x20, 0x4d0, &pics[0]);
|
|
pic_init1(0xa0, 0x4d1, &pics[1]);
|
|
pics[0].elcr_mask = 0xf8;
|
|
pics[1].elcr_mask = 0xde;
|
|
pics[0].irq_base = 0xff;
|
|
pics[0].irq_base = 0xff;
|
|
}
|
|
|