Index: HelenOS.config =================================================================== --- HelenOS.config (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ HelenOS.config (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -4,4 +4,5 @@ @ "amd64" AMD64/Intel EM64T (PC) @ "ia32" Intel IA-32 (PC) +@ "ia32xen" Intel IA-32 on Xen hypervisor @ "ia64" Intel IA-64 (Ski) @ "mips32msim" MIPS 32-bit (MSIM) @@ -13,5 +14,4 @@ @ "ppc64" PowerPC 64-bit (iMac G5) @ "sparc64" Sun UltraSPARC 64-bit -@ "xen32" Xen 32-bit (PC) ! PLATFORM (choice) Index: Makefile =================================================================== --- Makefile (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ Makefile (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -112,8 +112,8 @@ endif -ifeq ($(PLATFORM),xen32) - KARCH = xen32 +ifeq ($(PLATFORM),ia32xen) + KARCH = ia32xen UARCH = ia32 - BARCH = xen32 + BARCH = ia32xen endif Index: boot/arch/ia32xen/Makefile.inc =================================================================== --- boot/arch/ia32xen/Makefile.inc (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ boot/arch/ia32xen/Makefile.inc (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,60 @@ +# +# Copyright (C) 2006 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +TASKS = \ + $(USPACEDIR)/init/init \ + $(USPACEDIR)/ns/ns \ + $(USPACEDIR)/pci/pci \ + $(USPACEDIR)/fb/fb \ + $(USPACEDIR)/kbd/kbd \ + $(USPACEDIR)/console/console \ + $(USPACEDIR)/tetris/tetris \ + $(USPACEDIR)/ipcc/ipcc \ + $(USPACEDIR)/klog/klog + +build: $(BASE)/image.iso + +$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/grub/menu.debug.lst arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/grub/xen.debug.gz $(KERNELDIR)/kernel.bin $(TASKS) + mkdir -p arch/$(ARCH)/iso/boot/grub + cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ +ifeq ($(CONFIG_DEBUG),y) + cp arch/$(ARCH)/grub/menu.debug.lst arch/$(ARCH)/iso/boot/grub/menu.lst + cp arch/$(ARCH)/grub/xen.debug.gz arch/$(ARCH)/iso/boot/xen.gz +else + cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ + cp arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/iso/boot/ +endif + cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ + for task in $(TASKS) ; do \ + cp $$task arch/$(ARCH)/iso/boot/ ; \ + done + mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/ + +clean: + -rm -fr arch/$(ARCH)/iso + -rm -f $(BASE)/image.iso Index: boot/arch/ia32xen/grub/COPYING =================================================================== --- boot/arch/ia32xen/grub/COPYING (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ boot/arch/ia32xen/grub/COPYING (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,345 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Index: boot/arch/ia32xen/grub/README =================================================================== --- boot/arch/ia32xen/grub/README (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ boot/arch/ia32xen/grub/README (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,5 @@ +For licensing terms of GRUB boot loader see the file COPYING contained +in this directory. Full version of GRUB, including its source code, +can be downloaded from GRUB's project page: + +http://www.gnu.org/software/grub/ Index: boot/arch/ia32xen/grub/menu.debug.lst =================================================================== --- boot/arch/ia32xen/grub/menu.debug.lst (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ boot/arch/ia32xen/grub/menu.debug.lst (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,16 @@ +default 0 +timeout 10 + +title=HelenOS/ia32xen +root (cd) +kernel /boot/xen.gz noreboot console=com1,vga com1=auto,8n1,0x3f8 +module /boot/kernel.bin +module /boot/ns +module /boot/init +module /boot/pci +module /boot/fb +module /boot/kbd +module /boot/console +module /boot/tetris +module /boot/ipcc +module /boot/klog Index: boot/arch/ia32xen/grub/menu.lst =================================================================== --- boot/arch/ia32xen/grub/menu.lst (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ boot/arch/ia32xen/grub/menu.lst (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,16 @@ +default 0 +timeout 10 + +title=HelenOS/ia32xen +root (cd) +kernel /boot/xen.gz +module /boot/kernel.bin +module /boot/ns +module /boot/init +module /boot/pci +module /boot/fb +module /boot/kbd +module /boot/console +module /boot/tetris +module /boot/ipcc +module /boot/klog Index: ot/arch/xen32/Makefile.inc =================================================================== --- boot/arch/xen32/Makefile.inc (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ (revision ) @@ -1,60 +1,0 @@ -# -# Copyright (C) 2006 Martin Decky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -TASKS = \ - $(USPACEDIR)/init/init \ - $(USPACEDIR)/ns/ns \ - $(USPACEDIR)/pci/pci \ - $(USPACEDIR)/fb/fb \ - $(USPACEDIR)/kbd/kbd \ - $(USPACEDIR)/console/console \ - $(USPACEDIR)/tetris/tetris \ - $(USPACEDIR)/ipcc/ipcc \ - $(USPACEDIR)/klog/klog - -build: $(BASE)/image.iso - -$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/grub/menu.debug.lst arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/grub/xen.debug.gz $(KERNELDIR)/kernel.bin $(TASKS) - mkdir -p arch/$(ARCH)/iso/boot/grub - cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ -ifeq ($(CONFIG_DEBUG),y) - cp arch/$(ARCH)/grub/menu.debug.lst arch/$(ARCH)/iso/boot/grub/menu.lst - cp arch/$(ARCH)/grub/xen.debug.gz arch/$(ARCH)/iso/boot/xen.gz -else - cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ - cp arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/iso/boot/ -endif - cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ - for task in $(TASKS) ; do \ - cp $$task arch/$(ARCH)/iso/boot/ ; \ - done - mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/ - -clean: - -rm -fr arch/$(ARCH)/iso - -rm -f $(BASE)/image.iso Index: ot/arch/xen32/grub/COPYING =================================================================== --- boot/arch/xen32/grub/COPYING (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ (revision ) @@ -1,345 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Index: ot/arch/xen32/grub/README =================================================================== --- boot/arch/xen32/grub/README (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ (revision ) @@ -1,5 +1,0 @@ -For licensing terms of GRUB boot loader see the file COPYING contained -in this directory. Full version of GRUB, including its source code, -can be downloaded from GRUB's project page: - -http://www.gnu.org/software/grub/ Index: ot/arch/xen32/grub/menu.debug.lst =================================================================== --- boot/arch/xen32/grub/menu.debug.lst (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ (revision ) @@ -1,16 +1,0 @@ -default 0 -timeout 10 - -title=HelenOS/Xen -root (cd) -kernel /boot/xen.gz noreboot console=com1,vga com1=auto,8n1,0x3f8 -module /boot/kernel.bin -module /boot/ns -module /boot/init -module /boot/pci -module /boot/fb -module /boot/kbd -module /boot/console -module /boot/tetris -module /boot/ipcc -module /boot/klog Index: ot/arch/xen32/grub/menu.lst =================================================================== --- boot/arch/xen32/grub/menu.lst (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ (revision ) @@ -1,16 +1,0 @@ -default 0 -timeout 10 - -title=HelenOS/Xen -root (cd) -kernel /boot/xen.gz -module /boot/kernel.bin -module /boot/ns -module /boot/init -module /boot/pci -module /boot/fb -module /boot/kbd -module /boot/console -module /boot/tetris -module /boot/ipcc -module /boot/klog Index: boot/boot.config =================================================================== --- boot/boot.config (revision 21915410869963d7dc9d79029b3a95c090fded37) +++ boot/boot.config (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -4,4 +4,5 @@ @ "amd64" AMD64/Intel EM64T @ "ia32" Intel IA-32 +@ "ia32xen" Intel IA-32 on Xen hypervisor @ "ia64" Intel IA-64 @ "mips32" MIPS 32-bit @@ -9,5 +10,4 @@ @ "ppc64" PowerPC 64-bit @ "sparc64" Sun UltraSPARC -@ "xen32" Xen 32-bit ! ARCH (choice) Index: kernel/arch/ia32xen/Makefile.inc =================================================================== --- kernel/arch/ia32xen/Makefile.inc (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/Makefile.inc (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,122 @@ +# +# Copyright (C) 2006 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Toolchain configuration +# + +BFD_NAME = elf32-i386 +BFD_ARCH = i386 +BFD = elf32-i386 +TARGET = i686-pc-linux-gnu +TOOLCHAIN_DIR = /usr/local/i686/bin + +DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__ + +## Accepted CPUs +# + +ifeq ($(MACHINE),athlon-xp) + CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow + DEFS += -DCONFIG_FENCES_P3 + CONFIG_SMP = n + CONFIG_HT = n +endif +ifeq ($(MACHINE),athlon-mp) + CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow + DEFS += -DCONFIG_FENCES_P3 + CONFIG_HT = n +endif +ifeq ($(MACHINE),pentium3) + CFLAGS += -march=pentium3 -mmmx -msse + DEFS += -DCONFIG_FENCES_P3 + CONFIG_HT = n +endif +ifeq ($(MACHINE),prescott) + CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3 + DEFS += -DCONFIG_FENCES_P4 +endif +ifeq ($(MACHINE),pentium4) + CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 + DEFS += -DCONFIG_FENCES_P4 +endif + +## Own configuration directives +# + +CONFIG_ACPI = y + +## Compile with hierarchical page tables support. +# + +CONFIG_PAGE_PT = y +DEFS += -DCONFIG_PAGE_PT + +## Accepted configuration directives +# + +ifeq ($(CONFIG_SMP),y) + DEFS += -DCONFIG_SMP +endif +ifeq ($(CONFIG_HT),y) + DEFS += -DCONFIG_HT +endif + +## Compile with support for software integer division. +# + +CONFIG_SOFTINT = y + +ARCH_SOURCES = \ + arch/$(ARCH)/src/context.s \ + arch/$(ARCH)/src/debug/panic.s \ + arch/$(ARCH)/src/delay.s \ + arch/$(ARCH)/src/asm.S \ + arch/$(ARCH)/src/proc/scheduler.c \ + arch/$(ARCH)/src/proc/task.c \ + arch/$(ARCH)/src/proc/thread.c \ + arch/$(ARCH)/src/bios/bios.c \ + arch/$(ARCH)/src/smp/apic.c \ + arch/$(ARCH)/src/smp/mps.c \ + arch/$(ARCH)/src/smp/smp.c \ + arch/$(ARCH)/src/atomic.S \ + arch/$(ARCH)/src/smp/ipi.c \ + arch/$(ARCH)/src/xen32.c \ + arch/$(ARCH)/src/interrupt.c \ + arch/$(ARCH)/src/pm.c \ + arch/$(ARCH)/src/userspace.c \ + arch/$(ARCH)/src/cpu/cpu.c \ + arch/$(ARCH)/src/mm/as.c \ + arch/$(ARCH)/src/mm/frame.c \ + arch/$(ARCH)/src/mm/memory_init.c \ + arch/$(ARCH)/src/mm/page.c \ + arch/$(ARCH)/src/mm/tlb.c \ + arch/$(ARCH)/src/ddi/ddi.c \ + arch/$(ARCH)/src/drivers/xconsole.c \ + arch/$(ARCH)/src/boot/boot.S \ + arch/$(ARCH)/src/fpu_context.c \ + arch/$(ARCH)/src/debugger.c Index: kernel/arch/ia32xen/_link.ld.in =================================================================== --- kernel/arch/ia32xen/_link.ld.in (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/_link.ld.in (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,41 @@ +/** Xen32 linker script + */ + +#define __ASM__ +#include +#include + +ENTRY(kernel_image_start) + +SECTIONS { + __xen_guest : { + *(__xen_guest); + } + + .image PA2KA(BOOT_OFFSET): { + ktext_start = .; + *(K_TEXT_START); + *(.text); + ktext_end = .; + + kdata_start = .; + *(.data); /* initialized data */ + *(.rodata*); /* string literals */ + *(COMMON); /* global variables */ + hardcoded_load_address = .; + LONG(PA2KA(0)); + hardcoded_ktext_size = .; + LONG(ktext_end - ktext_start); + hardcoded_kdata_size = .; + LONG(kdata_end - kdata_start); + symbol_table = .; + *(symtab.*); /* Symbol table, must be LAST symbol! */ + *(.bss); /* uninitialized static variables */ + kdata_end = .; + } + + /DISCARD/ : { + *(.note.GNU-stack); + *(.comment); + } +} Index: kernel/arch/ia32xen/include/arch.h =================================================================== --- kernel/arch/ia32xen/include/arch.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/arch.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/arch.h Index: kernel/arch/ia32xen/include/arg.h =================================================================== --- kernel/arch/ia32xen/include/arg.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/arg.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/arg.h Index: kernel/arch/ia32xen/include/asm.h =================================================================== --- kernel/arch/ia32xen/include/asm.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/asm.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,281 @@ +/* + * Copyright (C) 2001-2004 Jakub Jermar + * Copyright (C) 2005 Sergey Bondari + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_ASM_H_ +#define KERN_ia32xen_ASM_H_ + +#include +#include +#include +#include + +extern void enable_l_apic_in_msr(void); + + +extern void asm_delay_loop(uint32_t t); +extern void asm_fake_loop(uint32_t t); + + +/** Halt CPU + * + * Halt the current CPU until interrupt event. + */ +#define cpu_halt() ((void) 0) +#define cpu_sleep() ((void) 0) + +#define GEN_READ_REG(reg) static inline unative_t read_ ##reg (void) \ + { \ + unative_t res; \ + __asm__ volatile ("movl %%" #reg ", %0" : "=r" (res) ); \ + return res; \ + } + +#define GEN_WRITE_REG(reg) static inline void write_ ##reg (unative_t regn) \ + { \ + __asm__ volatile ("movl %0, %%" #reg : : "r" (regn)); \ + } + +GEN_READ_REG(cr0); +GEN_READ_REG(cr2); + +GEN_READ_REG(dr0); +GEN_READ_REG(dr1); +GEN_READ_REG(dr2); +GEN_READ_REG(dr3); +GEN_READ_REG(dr6); +GEN_READ_REG(dr7); + +GEN_WRITE_REG(dr0); +GEN_WRITE_REG(dr1); +GEN_WRITE_REG(dr2); +GEN_WRITE_REG(dr3); +GEN_WRITE_REG(dr6); +GEN_WRITE_REG(dr7); + +/** Byte to port + * + * Output byte to port + * + * @param port Port to write to + * @param val Value to write + */ +static inline void outb(uint16_t port, uint8_t val) { __asm__ volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); } + +/** Word to port + * + * Output word to port + * + * @param port Port to write to + * @param val Value to write + */ +static inline void outw(uint16_t port, uint16_t val) { __asm__ volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port) ); } + +/** Double word to port + * + * Output double word to port + * + * @param port Port to write to + * @param val Value to write + */ +static inline void outl(uint16_t port, uint32_t val) { __asm__ volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port) ); } + +/** Byte from port + * + * Get byte from port + * + * @param port Port to read from + * @return Value read + */ +static inline uint8_t inb(uint16_t port) { uint8_t val; __asm__ volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) ); return val; } + +/** Word from port + * + * Get word from port + * + * @param port Port to read from + * @return Value read + */ +static inline uint16_t inw(uint16_t port) { uint16_t val; __asm__ volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port) ); return val; } + +/** Double word from port + * + * Get double word from port + * + * @param port Port to read from + * @return Value read + */ +static inline uint32_t inl(uint16_t port) { uint32_t val; __asm__ volatile ("inl %w1, %l0 \n" : "=a" (val) : "d" (port) ); return val; } + +/** Enable interrupts. + * + * Enable interrupts and return previous + * value of EFLAGS. + * + * @return Old interrupt priority level. + */ +static inline ipl_t interrupts_enable(void) +{ + // FIXME SMP + + ipl_t v = shared_info.vcpu_info[0].evtchn_upcall_mask; + write_barrier(); + shared_info.vcpu_info[0].evtchn_upcall_mask = 0; + write_barrier(); + if (shared_info.vcpu_info[0].evtchn_upcall_pending) + force_evtchn_callback(); + + return v; +} + +/** Disable interrupts. + * + * Disable interrupts and return previous + * value of EFLAGS. + * + * @return Old interrupt priority level. + */ +static inline ipl_t interrupts_disable(void) +{ + // FIXME SMP + + ipl_t v = shared_info.vcpu_info[0].evtchn_upcall_mask; + shared_info.vcpu_info[0].evtchn_upcall_mask = 1; + write_barrier(); + + return v; +} + +/** Restore interrupt priority level. + * + * Restore EFLAGS. + * + * @param ipl Saved interrupt priority level. + */ +static inline void interrupts_restore(ipl_t ipl) +{ + if (ipl == 0) + interrupts_enable(); + else + interrupts_disable(); +} + +/** Return interrupt priority level. + * + * @return EFLAFS. + */ +static inline ipl_t interrupts_read(void) +{ + // FIXME SMP + + return shared_info.vcpu_info[0].evtchn_upcall_mask; +} + +/** Return base address of current stack + * + * Return the base address of the current stack. + * The stack is assumed to be STACK_SIZE bytes long. + * The stack must start on page boundary. + */ +static inline uintptr_t get_stack_base(void) +{ + uintptr_t v; + + __asm__ volatile ("andl %%esp, %0\n" : "=r" (v) : "0" (~(STACK_SIZE-1))); + + return v; +} + +static inline uint64_t rdtsc(void) +{ + uint64_t v; + + __asm__ volatile("rdtsc\n" : "=A" (v)); + + return v; +} + +/** Return current IP address */ +static inline uintptr_t * get_ip() +{ + uintptr_t *ip; + + __asm__ volatile ( + "mov %%eip, %0" + : "=r" (ip) + ); + return ip; +} + +/** Invalidate TLB Entry. + * + * @param addr Address on a page whose TLB entry is to be invalidated. + */ +static inline void invlpg(uintptr_t addr) +{ + __asm__ volatile ("invlpg %0\n" :: "m" (*(unative_t *)addr)); +} + +/** Load GDTR register from memory. + * + * @param gdtr_reg Address of memory from where to load GDTR. + */ +static inline void gdtr_load(ptr_16_32_t *gdtr_reg) +{ + __asm__ volatile ("lgdtl %0\n" : : "m" (*gdtr_reg)); +} + +/** Store GDTR register to memory. + * + * @param gdtr_reg Address of memory to where to load GDTR. + */ +static inline void gdtr_store(ptr_16_32_t *gdtr_reg) +{ + __asm__ volatile ("sgdtl %0\n" : : "m" (*gdtr_reg)); +} + +/** Load TR from descriptor table. + * + * @param sel Selector specifying descriptor of TSS segment. + */ +static inline void tr_load(uint16_t sel) +{ + __asm__ volatile ("ltr %0" : : "r" (sel)); +} + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/atomic.h =================================================================== --- kernel/arch/ia32xen/include/atomic.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/atomic.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/atomic.h Index: kernel/arch/ia32xen/include/barrier.h =================================================================== --- kernel/arch/ia32xen/include/barrier.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/barrier.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/barrier.h Index: kernel/arch/ia32xen/include/bios =================================================================== --- kernel/arch/ia32xen/include/bios (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/bios (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/bios Index: kernel/arch/ia32xen/include/boot/boot.h =================================================================== --- kernel/arch/ia32xen/include/boot/boot.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/boot/boot.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_BOOT_H_ +#define KERN_ia32xen_BOOT_H_ + +#define GUEST_CMDLINE 1024 +#define VIRT_CPUS 32 +#define START_INFO_SIZE 1104 + +#define BOOT_OFFSET 0x0000 +#define TEMP_STACK_SIZE 0x1000 + +#define XEN_VIRT_START 0xFC000000 +#define XEN_CS 0xe019 + +#ifndef __ASM__ + +#define mp_map ((pfn_t *) XEN_VIRT_START) + +#define SIF_PRIVILEGED (1 << 0) /**< Privileged domain */ +#define SIF_INITDOMAIN (1 << 1) /**< Iinitial control domain */ + +#include + +typedef uint32_t evtchn_t; + +typedef struct { + uint32_t version; + uint32_t pad0; + uint64_t tsc_timestamp; /**< TSC at last update of time vals */ + uint64_t system_time; /**< Time, in nanosecs, since boot */ + uint32_t tsc_to_system_mul; + int8_t tsc_shift; + int8_t pad1[3]; +} vcpu_time_info_t; + +typedef struct { + uint32_t cr2; + uint32_t pad[5]; +} arch_vcpu_info_t; + +typedef struct arch_shared_info { + pfn_t max_pfn; /**< max pfn that appears in table */ + uint32_t pfn_to_mfn_frame_list_list; + uint32_t nmi_reason; +} arch_shared_info_t; + +typedef struct { + uint8_t evtchn_upcall_pending; + ipl_t evtchn_upcall_mask; + evtchn_t evtchn_pending_sel; + arch_vcpu_info_t arch; + vcpu_time_info_t time; +} vcpu_info_t; + +typedef struct { + vcpu_info_t vcpu_info[VIRT_CPUS]; + evtchn_t evtchn_pending[32]; + evtchn_t evtchn_mask[32]; + + uint32_t wc_version; /**< Version counter */ + uint32_t wc_sec; /**< Secs 00:00:00 UTC, Jan 1, 1970 */ + uint32_t wc_nsec; /**< Nsecs 00:00:00 UTC, Jan 1, 1970 */ + + arch_shared_info_t arch; +} shared_info_t; + +typedef struct { + int8_t magic[32]; /**< "xen--" */ + uint32_t frames; /**< Available frames */ + shared_info_t *shared_info; /**< Shared info structure (machine address) */ + uint32_t flags; /**< SIF_xxx flags */ + pfn_t store_mfn; /**< Shared page (machine page) */ + evtchn_t store_evtchn; /**< Event channel for store communication */ + pfn_t console_mfn; /**< Console page (machine page) */ + evtchn_t console_evtchn; /**< Event channel for console messages */ + pte_t *ptl0; /**< Boot PTL0 (kernel address) */ + uint32_t pt_frames; /**< Number of bootstrap page table frames */ + pfn_t *pm_map; /**< Physical->machine frame map (kernel address) */ + void *mod_start; /**< Modules start (kernel address) */ + uint32_t mod_len; /**< Modules size (bytes) */ + int8_t cmd_line[GUEST_CMDLINE]; +} start_info_t; + +typedef struct { + pfn_t start; + pfn_t size; + pfn_t reserved; +} memzone_t; + +extern start_info_t start_info; +extern shared_info_t shared_info; +extern memzone_t meminfo; + +#endif + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/byteorder.h =================================================================== --- kernel/arch/ia32xen/include/byteorder.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/byteorder.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/byteorder.h Index: kernel/arch/ia32xen/include/context.h =================================================================== --- kernel/arch/ia32xen/include/context.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/context.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/context.h Index: kernel/arch/ia32xen/include/cpu.h =================================================================== --- kernel/arch/ia32xen/include/cpu.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/cpu.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/cpu.h Index: kernel/arch/ia32xen/include/cpuid.h =================================================================== --- kernel/arch/ia32xen/include/cpuid.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/cpuid.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/cpuid.h Index: kernel/arch/ia32xen/include/ddi =================================================================== --- kernel/arch/ia32xen/include/ddi (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/ddi (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/ddi Index: kernel/arch/ia32xen/include/debug.h =================================================================== --- kernel/arch/ia32xen/include/debug.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/debug.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/debug.h Index: kernel/arch/ia32xen/include/debugger.h =================================================================== --- kernel/arch/ia32xen/include/debugger.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/debugger.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/debugger.h Index: kernel/arch/ia32xen/include/drivers/xconsole.h =================================================================== --- kernel/arch/ia32xen/include/drivers/xconsole.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/drivers/xconsole.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_XCONSOLE_H_ +#define KERN_ia32xen_XCONSOLE_H_ + +#include + +typedef struct { + char in[1024]; + char out[2048]; + uint32_t in_cons; + uint32_t in_prod; + uint32_t out_cons; + uint32_t out_prod; +} xencons_t; + +extern xencons_t console_page; + +extern void xen_console_init(void); + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/elf.h =================================================================== --- kernel/arch/ia32xen/include/elf.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/elf.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/elf.h Index: kernel/arch/ia32xen/include/faddr.h =================================================================== --- kernel/arch/ia32xen/include/faddr.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/faddr.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/faddr.h Index: kernel/arch/ia32xen/include/fpu_context.h =================================================================== --- kernel/arch/ia32xen/include/fpu_context.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/fpu_context.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/fpu_context.h Index: kernel/arch/ia32xen/include/hypercall.h =================================================================== --- kernel/arch/ia32xen/include/hypercall.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/hypercall.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,252 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef KERN_ia32xen_HYPERCALL_H_ +#define KERN_ia32xen_HYPERCALL_H_ + +#include +#include + +typedef uint16_t domid_t; + +typedef struct { + uint8_t vector; /**< Exception vector */ + uint8_t flags; /**< 0-3: privilege level; 4: clear event enable */ + uint16_t cs; /**< Code selector */ + void *address; /**< Code offset */ +} trap_info_t; + + +typedef struct { + evtchn_t port; +} evtchn_send_t; + +typedef struct { + uint32_t cmd; + union { + evtchn_send_t send; + }; +} evtchn_op_t; + + +#define XEN_SET_TRAP_TABLE 0 +#define XEN_MMU_UPDATE 1 +#define XEN_SET_CALLBACKS 4 +#define XEN_UPDATE_VA_MAPPING 14 +#define XEN_EVENT_CHANNEL_OP 16 +#define XEN_VERSION 17 +#define XEN_CONSOLE_IO 18 +#define XEN_VM_ASSIST 21 +#define XEN_MMUEXT_OP 26 + + +/* + * Commands for XEN_CONSOLE_IO + */ +#define CONSOLE_IO_WRITE 0 +#define CONSOLE_IO_READ 1 + + +#define MMUEXT_PIN_L1_TABLE 0 +#define MMUEXT_PIN_L2_TABLE 1 +#define MMUEXT_PIN_L3_TABLE 2 +#define MMUEXT_PIN_L4_TABLE 3 +#define MMUEXT_UNPIN_TABLE 4 +#define MMUEXT_NEW_BASEPTR 5 +#define MMUEXT_TLB_FLUSH_LOCAL 6 +#define MMUEXT_INVLPG_LOCAL 7 +#define MMUEXT_TLB_FLUSH_MULTI 8 +#define MMUEXT_INVLPG_MULTI 9 +#define MMUEXT_TLB_FLUSH_ALL 10 +#define MMUEXT_INVLPG_ALL 11 +#define MMUEXT_FLUSH_CACHE 12 +#define MMUEXT_SET_LDT 13 +#define MMUEXT_NEW_USER_BASEPTR 15 + + +#define EVTCHNOP_SEND 4 + + +#define UVMF_NONE 0 /**< No flushing at all */ +#define UVMF_TLB_FLUSH 1 /**< Flush entire TLB(s) */ +#define UVMF_INVLPG 2 /**< Flush only one entry */ +#define UVMF_FLUSHTYPE_MASK 3 +#define UVMF_MULTI 0 /**< Flush subset of TLBs */ +#define UVMF_LOCAL 0 /**< Flush local TLB */ +#define UVMF_ALL (1 << 2) /**< Flush all TLBs */ + + +/* + * Commands to XEN_VM_ASSIST + */ +#define VMASST_CMD_ENABLE 0 +#define VMASST_CMD_DISABLE 1 +#define VMASST_TYPE_4GB_SEGMENTS 0 +#define VMASST_TYPE_4GB_SEGMENTS_NOTIFY 1 +#define VMASST_TYPE_WRITABLE_PAGETABLES 2 + + +#define DOMID_SELF (0x7FF0U) +#define DOMID_IO (0x7FF1U) + + +#define force_evtchn_callback() ((void) xen_version(0, 0)) + +#define hypercall0(id) \ + ({ \ + unative_t ret; \ + asm volatile ( \ + "call hypercall_page + (" STRING(id) " * 32)\n" \ + : "=a" (ret) \ + : \ + : "memory" \ + ); \ + ret; \ + }) + +#define hypercall1(id, p1) \ + ({ \ + unative_t ret, __ign1; \ + asm volatile ( \ + "call hypercall_page + (" STRING(id) " * 32)\n" \ + : "=a" (ret), \ + "=b" (__ign1) \ + : "1" (p1) \ + : "memory" \ + ); \ + ret; \ + }) + +#define hypercall2(id, p1, p2) \ + ({ \ + unative_t ret, __ign1, __ign2; \ + asm volatile ( \ + "call hypercall_page + (" STRING(id) " * 32)\n" \ + : "=a" (ret), \ + "=b" (__ign1), \ + "=c" (__ign2) \ + : "1" (p1), \ + "2" (p2) \ + : "memory" \ + ); \ + ret; \ + }) + +#define hypercall3(id, p1, p2, p3) \ + ({ \ + unative_t ret, __ign1, __ign2, __ign3; \ + asm volatile ( \ + "call hypercall_page + (" STRING(id) " * 32)\n" \ + : "=a" (ret), \ + "=b" (__ign1), \ + "=c" (__ign2), \ + "=d" (__ign3) \ + : "1" (p1), \ + "2" (p2), \ + "3" (p3) \ + : "memory" \ + ); \ + ret; \ + }) + +#define hypercall4(id, p1, p2, p3, p4) \ + ({ \ + unative_t ret, __ign1, __ign2, __ign3, __ign4; \ + asm volatile ( \ + "call hypercall_page + (" STRING(id) " * 32)\n" \ + : "=a" (ret), \ + "=b" (__ign1), \ + "=c" (__ign2), \ + "=d" (__ign3), \ + "=S" (__ign4) \ + : "1" (p1), \ + "2" (p2), \ + "3" (p3), \ + "4" (p4) \ + : "memory" \ + ); \ + ret; \ + }) + +#define hypercall5(id, p1, p2, p3, p4, p5) \ + ({ \ + unative_t ret, __ign1, __ign2, __ign3, __ign4, __ign5; \ + asm volatile ( \ + "call hypercall_page + (" STRING(id) " * 32)\n" \ + : "=a" (ret), \ + "=b" (__ign1), \ + "=c" (__ign2), \ + "=d" (__ign3), \ + "=S" (__ign4), \ + "=D" (__ign5) \ + : "1" (p1), \ + "2" (p2), \ + "3" (p3), \ + "4" (p4), \ + "5" (p5) \ + : "memory" \ + ); \ + ret; \ + }) + + +static inline int xen_console_io(const unsigned int cmd, const unsigned int count, const char *str) +{ + return hypercall3(XEN_CONSOLE_IO, cmd, count, str); +} + +static inline int xen_vm_assist(const unsigned int cmd, const unsigned int type) +{ + return hypercall2(XEN_VM_ASSIST, cmd, type); +} + +static inline int xen_set_callbacks(const unsigned int event_selector, const void *event_address, const unsigned int failsafe_selector, void *failsafe_address) +{ + return hypercall4(XEN_SET_CALLBACKS, event_selector, event_address, failsafe_selector, failsafe_address); +} + +static inline int xen_set_trap_table(const trap_info_t *table) +{ + return hypercall1(XEN_SET_TRAP_TABLE, table); +} + +static inline int xen_version(const unsigned int cmd, const void *arg) +{ + return hypercall2(XEN_VERSION, cmd, arg); +} + +static inline int xen_notify_remote(evtchn_t channel) +{ + evtchn_op_t op; + + op.cmd = EVTCHNOP_SEND; + op.send.port = channel; + return hypercall1(XEN_EVENT_CHANNEL_OP, &op); +} + +#endif Index: kernel/arch/ia32xen/include/interrupt.h =================================================================== --- kernel/arch/ia32xen/include/interrupt.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/interrupt.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/interrupt.h Index: kernel/arch/ia32xen/include/memstr.h =================================================================== --- kernel/arch/ia32xen/include/memstr.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/memstr.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/memstr.h Index: kernel/arch/ia32xen/include/mm/as.h =================================================================== --- kernel/arch/ia32xen/include/mm/as.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/mm/as.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_AS_H_ +#define KERN_ia32xen_AS_H_ + +#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 + +#define KERNEL_ADDRESS_SPACE_START_ARCH ((unsigned long) 0x80000000) +#define KERNEL_ADDRESS_SPACE_END_ARCH ((unsigned long) 0xffffffff) +#define USER_ADDRESS_SPACE_START_ARCH ((unsigned long) 0x00000000) +#define USER_ADDRESS_SPACE_END_ARCH ((unsigned long) 0x7fffffff) + +#define USTACK_ADDRESS_ARCH (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1)) + +typedef struct { +} as_arch_t; + +#define as_constructor_arch(as, flags) (as != as) +#define as_destructor_arch(as) (as != as) +#define as_create_arch(as, flags) (as != as) +#define as_install_arch(as) +#define as_deinstall_arch(as) +#define as_invalidate_translation_cache(as, page, cnt) + +extern void as_arch_init(void); + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/mm/asid.h =================================================================== --- kernel/arch/ia32xen/include/mm/asid.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/mm/asid.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + * @ingroup ia32xen_mm + */ + +/* + * ia32xen has no hardware support for address space identifiers. + * This file is provided to do nop-implementation of mm/asid.h + * interface. + */ + +#ifndef KERN_ia32xen_ASID_H_ +#define KERN_ia32xen_ASID_H_ + +typedef int asid_t; + +#define ASID_MAX_ARCH 3 + +#define asid_get() (ASID_START+1) +#define asid_put(asid) + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/mm/frame.h =================================================================== --- kernel/arch/ia32xen/include/mm/frame.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/mm/frame.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_FRAME_H_ +#define KERN_ia32xen_FRAME_H_ + +#define FRAME_WIDTH 12 /* 4K */ +#define FRAME_SIZE (1 << FRAME_WIDTH) + + +#ifdef KERNEL +#ifndef __ASM__ + +#include +#include + +#define PA2MA(x) ((start_info.pm_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff)) +#define MA2PA(x) ((mp_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff)) + +extern void frame_arch_init(void); + +#endif /* __ASM__ */ +#endif /* KERNEL */ + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/mm/memory_init.h =================================================================== --- kernel/arch/ia32xen/include/mm/memory_init.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/mm/memory_init.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + * @ingroup ia32xen_mm + */ + +#ifndef KERN_ia32xen_MEMORY_INIT_H_ +#define KERN_ia32xen_MEMORY_INIT_H_ + +#include + +size_t get_memory_size(void); + +void memory_print_map(void); + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/mm/page.h =================================================================== --- kernel/arch/ia32xen/include/mm/page.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/mm/page.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,221 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_PAGE_H_ +#define KERN_ia32xen_PAGE_H_ + +#include + +#define PAGE_WIDTH FRAME_WIDTH +#define PAGE_SIZE FRAME_SIZE + +#ifdef KERNEL + +#ifndef __ASM__ +# define KA2PA(x) (((uintptr_t) (x)) - 0x80000000) +# define PA2KA(x) (((uintptr_t) (x)) + 0x80000000) +#else +# define KA2PA(x) ((x) - 0x80000000) +# define PA2KA(x) ((x) + 0x80000000) +#endif + +/* + * Implementation of generic 4-level page table interface. + * IA-32 has 2-level page tables, so PTL1 and PTL2 are left out. + */ +#define PTL0_ENTRIES_ARCH 1024 +#define PTL1_ENTRIES_ARCH 0 +#define PTL2_ENTRIES_ARCH 0 +#define PTL3_ENTRIES_ARCH 1024 + +#define PTL0_INDEX_ARCH(vaddr) (((vaddr) >> 22) & 0x3ff) +#define PTL1_INDEX_ARCH(vaddr) 0 +#define PTL2_INDEX_ARCH(vaddr) 0 +#define PTL3_INDEX_ARCH(vaddr) (((vaddr) >> 12) & 0x3ff) + +#define GET_PTL1_ADDRESS_ARCH(ptl0, i) ((pte_t *) MA2PA((((pte_t *) (ptl0))[(i)].frame_address) << 12)) +#define GET_PTL2_ADDRESS_ARCH(ptl1, i) (ptl1) +#define GET_PTL3_ADDRESS_ARCH(ptl2, i) (ptl2) +#define GET_FRAME_ADDRESS_ARCH(ptl3, i) ((uintptr_t) MA2PA((((pte_t *) (ptl3))[(i)].frame_address) << 12)) + +#define SET_PTL0_ADDRESS_ARCH(ptl0) { \ + mmuext_op_t mmu_ext; \ + \ + mmu_ext.cmd = MMUEXT_NEW_BASEPTR; \ + mmu_ext.mfn = ADDR2PFN(PA2MA(ptl0)); \ + xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF); \ +} + +#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) { \ + mmu_update_t update; \ + \ + update.ptr = PA2MA(KA2PA(&((pte_t *) (ptl0))[(i)])); \ + update.val = PA2MA(a) | 0x0003; \ + xen_mmu_update(&update, 1, NULL, DOMID_SELF); \ +} +#define SET_PTL2_ADDRESS_ARCH(ptl1, i, a) +#define SET_PTL3_ADDRESS_ARCH(ptl2, i, a) +#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) (((pte_t *) (ptl3))[(i)].frame_address = PA2MA(a) >> 12) + +#define GET_PTL1_FLAGS_ARCH(ptl0, i) get_pt_flags((pte_t *) (ptl0), (index_t)(i)) +#define GET_PTL2_FLAGS_ARCH(ptl1, i) PAGE_PRESENT +#define GET_PTL3_FLAGS_ARCH(ptl2, i) PAGE_PRESENT +#define GET_FRAME_FLAGS_ARCH(ptl3, i) get_pt_flags((pte_t *) (ptl3), (index_t)(i)) + +#define SET_PTL1_FLAGS_ARCH(ptl0, i, x) set_pt_flags((pte_t *) (ptl0), (index_t)(i), (x)) +#define SET_PTL2_FLAGS_ARCH(ptl1, i, x) +#define SET_PTL3_FLAGS_ARCH(ptl2, i, x) +#define SET_FRAME_FLAGS_ARCH(ptl3, i, x) set_pt_flags((pte_t *) (ptl3), (index_t)(i), (x)) + +#define PTE_VALID_ARCH(p) (*((uint32_t *) (p)) != 0) +#define PTE_PRESENT_ARCH(p) ((p)->present != 0) +#define PTE_GET_FRAME_ARCH(p) ((p)->frame_address << FRAME_WIDTH) +#define PTE_WRITABLE_ARCH(p) ((p)->writeable != 0) +#define PTE_EXECUTABLE_ARCH(p) 1 + +#ifndef __ASM__ + +#include +#include +#include +#include +#include + +/* Page fault error codes. */ + +/** When bit on this position is 0, the page fault was caused by a not-present page. */ +#define PFERR_CODE_P (1 << 0) + +/** When bit on this position is 1, the page fault was caused by a write. */ +#define PFERR_CODE_RW (1 << 1) + +/** When bit on this position is 1, the page fault was caused in user mode. */ +#define PFERR_CODE_US (1 << 2) + +/** When bit on this position is 1, a reserved bit was set in page directory. */ +#define PFERR_CODE_RSVD (1 << 3) + +/** Page Table Entry. */ +struct page_specifier { + unsigned present : 1; + unsigned writeable : 1; + unsigned uaccessible : 1; + unsigned page_write_through : 1; + unsigned page_cache_disable : 1; + unsigned accessed : 1; + unsigned dirty : 1; + unsigned pat : 1; + unsigned global : 1; + unsigned soft_valid : 1; /**< Valid content even if the present bit is not set. */ + unsigned avl : 2; + unsigned frame_address : 20; +} __attribute__ ((packed)); + +typedef struct { + uint64_t ptr; /**< Machine address of PTE */ + union { /**< New contents of PTE */ + uint64_t val; + pte_t pte; + }; +} mmu_update_t; + +typedef struct { + unsigned int cmd; + union { + unsigned long mfn; + unsigned long linear_addr; + }; + union { + unsigned int nr_ents; + void *vcpumask; + }; +} mmuext_op_t; + +static inline int xen_update_va_mapping(const void *va, const pte_t pte, const unsigned int flags) +{ + return hypercall4(XEN_UPDATE_VA_MAPPING, va, pte, 0, flags); +} + +static inline int xen_mmu_update(const mmu_update_t *req, const unsigned int count, unsigned int *success_count, domid_t domid) +{ + return hypercall4(XEN_MMU_UPDATE, req, count, success_count, domid); +} + +static inline int xen_mmuext_op(const mmuext_op_t *op, const unsigned int count, unsigned int *success_count, domid_t domid) +{ + return hypercall4(XEN_MMUEXT_OP, op, count, success_count, domid); +} + +static inline int get_pt_flags(pte_t *pt, index_t i) +{ + pte_t *p = &pt[i]; + + return ( + (!p->page_cache_disable)<present)<uaccessible<writeable<global<page_cache_disable = !(flags & PAGE_CACHEABLE); + p->present = !(flags & PAGE_NOT_PRESENT); + p->uaccessible = (flags & PAGE_USER) != 0; + p->writeable = (flags & PAGE_WRITE) != 0; + p->global = (flags & PAGE_GLOBAL) != 0; + + /* + * Ensure that there is at least one bit set even if the present bit is cleared. + */ + p->soft_valid = true; +} + +extern void page_arch_init(void); +extern void page_fault(int n, istate_t *istate); + +#endif /* __ASM__ */ + +#endif /* KERNEL */ + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/mm/tlb.h =================================================================== --- kernel/arch/ia32xen/include/mm/tlb.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/mm/tlb.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_TLB_H_ +#define KERN_ia32xen_TLB_H_ + +#define tlb_arch_init() +#define tlb_print() + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/pm.h =================================================================== --- kernel/arch/ia32xen/include/pm.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/pm.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,160 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_PM_H_ +#define KERN_ia32xen_PM_H_ + +#define IDT_ITEMS 64 +#define GDT_ITEMS 7 + +#define NULL_DES 0 +#define KTEXT_DES 1 +#define KDATA_DES 2 +#define UTEXT_DES 3 +#define UDATA_DES 4 +#define TSS_DES 5 +#define TLS_DES 6 /* Pointer to Thread-Local-Storage data */ + +#define selector(des) ((des) << 3) + +#define PL_KERNEL 1 +#define PL_USER 3 + +#define AR_PRESENT (1<<7) +#define AR_DATA (2<<3) +#define AR_CODE (3<<3) +#define AR_WRITABLE (1<<1) +#define AR_INTERRUPT (0xe) +#define AR_TSS (0x9) + +#define DPL_KERNEL (PL_KERNEL<<5) +#define DPL_USER (PL_USER<<5) + +#define TSS_BASIC_SIZE 104 +#define TSS_IOMAP_SIZE (16*1024+1) /* 16K for bitmap + 1 terminating byte for convenience */ + +#define IO_PORTS (64*1024) + +#ifndef __ASM__ + +#include +#include +#include + +struct ptr_16_32 { + uint16_t limit; + uint32_t base; +} __attribute__ ((packed)); +typedef struct ptr_16_32 ptr_16_32_t; + +struct descriptor { + unsigned limit_0_15: 16; + unsigned base_0_15: 16; + unsigned base_16_23: 8; + unsigned access: 8; + unsigned limit_16_19: 4; + unsigned available: 1; + unsigned unused: 1; + unsigned special: 1; + unsigned granularity : 1; + unsigned base_24_31: 8; +} __attribute__ ((packed)); +typedef struct descriptor descriptor_t; + +struct tss { + uint16_t link; + unsigned : 16; + uint32_t esp0; + uint16_t ss0; + unsigned : 16; + uint32_t esp1; + uint16_t ss1; + unsigned : 16; + uint32_t esp2; + uint16_t ss2; + unsigned : 16; + uint32_t cr3; + uint32_t eip; + uint32_t eflags; + uint32_t eax; + uint32_t ecx; + uint32_t edx; + uint32_t ebx; + uint32_t esp; + uint32_t ebp; + uint32_t esi; + uint32_t edi; + uint16_t es; + unsigned : 16; + uint16_t cs; + unsigned : 16; + uint16_t ss; + unsigned : 16; + uint16_t ds; + unsigned : 16; + uint16_t fs; + unsigned : 16; + uint16_t gs; + unsigned : 16; + uint16_t ldtr; + unsigned : 16; + unsigned : 16; + uint16_t iomap_base; + uint8_t iomap[TSS_IOMAP_SIZE]; +} __attribute__ ((packed)); +typedef struct tss tss_t; + +extern ptr_16_32_t gdtr; +extern ptr_16_32_t bootstrap_gdtr; +extern ptr_16_32_t protected_ap_gdtr; +extern struct tss *tss_p; + +extern descriptor_t gdt[]; + +extern void pm_init(void); + +extern void gdt_setbase(descriptor_t *d, uintptr_t base); +extern void gdt_setlimit(descriptor_t *d, uint32_t limit); + +extern void traps_init(void); + +extern void tss_initialize(tss_t *t); +extern void set_tls_desc(uintptr_t tls); + +#endif /* __ASM__ */ + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/include/proc =================================================================== --- kernel/arch/ia32xen/include/proc (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/proc (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/proc Index: kernel/arch/ia32xen/include/smp =================================================================== --- kernel/arch/ia32xen/include/smp (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/smp (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/include/smp Index: kernel/arch/ia32xen/include/types.h =================================================================== --- kernel/arch/ia32xen/include/types.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/include/types.h (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32xen_TYPES_H_ +#define KERN_ia32xen_TYPES_H_ + +#define NULL 0 + +typedef signed char int8_t; +typedef signed short int16_t; +typedef signed long int32_t; +typedef signed long long int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned long uint32_t; +typedef unsigned long long uint64_t; + +typedef uint32_t uintptr_t; +typedef uint32_t pfn_t; + +typedef uint8_t ipl_t; + +typedef uint32_t unative_t; +typedef int32_t native_t; + +typedef struct page_specifier pte_t; + +#endif + +/** @} + */ Index: kernel/arch/ia32xen/src/asm.S =================================================================== --- kernel/arch/ia32xen/src/asm.S (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/asm.S (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,124 @@ +# +# Copyright (C) 2001-2004 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## very low and hardware-level functions + +# Mask for interrupts 0 - 31 (bits 0 - 31) where 0 means that int has no error word +# and 1 means interrupt with error word +#define ERROR_WORD_INTERRUPT_LIST 0x00027D00 + +.text + +.global xen_callback +.global xen_failsafe_callback +.global enable_l_apic_in_msr +.global memcpy +.global memcpy_from_uspace +.global memcpy_from_uspace_failover_address +.global memcpy_to_uspace +.global memcpy_to_uspace_failover_address + + +xen_callback: + iret + +xen_failsafe_callback: + iret + + +#define MEMCPY_DST 4 +#define MEMCPY_SRC 8 +#define MEMCPY_SIZE 12 + +/** Copy memory to/from userspace. + * + * This is almost conventional memcpy(). + * The difference is that there is a failover part + * to where control is returned from a page fault + * if the page fault occurs during copy_from_uspace() + * or copy_to_uspace(). + * + * @param MEMCPY_DST(%esp) Destination address. + * @param MEMCPY_SRC(%esp) Source address. + * @param MEMCPY_SIZE(%esp) Size. + * + * @return MEMCPY_SRC(%esp) on success and 0 on failure. + */ +memcpy: +memcpy_from_uspace: +memcpy_to_uspace: + movl %edi, %edx /* save %edi */ + movl %esi, %eax /* save %esi */ + + movl MEMCPY_SIZE(%esp), %ecx + shrl $2, %ecx /* size / 4 */ + + movl MEMCPY_DST(%esp), %edi + movl MEMCPY_SRC(%esp), %esi + + rep movsl /* copy as much as possible word by word */ + + movl MEMCPY_SIZE(%esp), %ecx + andl $3, %ecx /* size % 4 */ + jz 0f + + rep movsb /* copy the rest byte by byte */ + +0: + movl %edx, %edi + movl %eax, %esi + movl MEMCPY_SRC(%esp), %eax /* MEMCPY_SRC(%esp), success */ + ret + +/* + * We got here from as_page_fault() after the memory operations + * above had caused a page fault. + */ +memcpy_from_uspace_failover_address: +memcpy_to_uspace_failover_address: + movl %edx, %edi + movl %eax, %esi + xorl %eax, %eax /* return 0, failure */ + ret + + +## Enable local APIC +# +# Enable local APIC in MSR. +# +enable_l_apic_in_msr: + push %eax + + movl $0x1b, %ecx + rdmsr + orl $(1<<11),%eax + orl $(0xfee00000),%eax + wrmsr + + pop %eax + ret Index: kernel/arch/ia32xen/src/atomic.S =================================================================== --- kernel/arch/ia32xen/src/atomic.S (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/atomic.S (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/atomic.S Index: kernel/arch/ia32xen/src/bios =================================================================== --- kernel/arch/ia32xen/src/bios (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/bios (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/bios Index: kernel/arch/ia32xen/src/boot/boot.S =================================================================== --- kernel/arch/ia32xen/src/boot/boot.S (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/boot/boot.S (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,83 @@ +# +# Copyright (C) 2006 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +#include +#include +#include + +.section __xen_guest + .ascii "GUEST_OS=HelenOS," + .ascii "XEN_VER=xen-3.0," + .ascii "HYPERCALL_PAGE=0x0000," + .ascii "LOADER=generic," + .ascii "FEATURES=writable_page_tables" + .byte 0 + +.text + +.code32 +.align 4 +.global kernel_image_start + +kernel_image_start: + # copy start_info (esi initialized by Xen) + + movl $start_info, %edi + movl $START_INFO_SIZE >> 2, %ecx + cld + rep movsb + + # switch to temporal kernel stack + + movl $kernel_stack, %esp + + call arch_pre_main + call main_bsp # never returns + + cli + hlt + +kernel_stack_bottom: + .space TEMP_STACK_SIZE +kernel_stack: + +.section K_TEXT_START, "aw", @progbits +.global hypercall_page +.org 0 +hypercall_page: + .space PAGE_SIZE + +.global shared_info +.org 0x1000 +shared_info: + .space PAGE_SIZE + +.global console_page +.org 0x2000 +console_page: + .space PAGE_SIZE Index: kernel/arch/ia32xen/src/context.s =================================================================== --- kernel/arch/ia32xen/src/context.s (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/context.s (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/context.s Index: kernel/arch/ia32xen/src/cpu =================================================================== --- kernel/arch/ia32xen/src/cpu (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/cpu (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/cpu Index: kernel/arch/ia32xen/src/ddi =================================================================== --- kernel/arch/ia32xen/src/ddi (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/ddi (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/ddi Index: kernel/arch/ia32xen/src/debug =================================================================== --- kernel/arch/ia32xen/src/debug (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/debug (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/debug Index: kernel/arch/ia32xen/src/debugger.c =================================================================== --- kernel/arch/ia32xen/src/debugger.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/debugger.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/debugger.c Index: kernel/arch/ia32xen/src/delay.s =================================================================== --- kernel/arch/ia32xen/src/delay.s (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/delay.s (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/delay.s Index: kernel/arch/ia32xen/src/drivers/xconsole.c =================================================================== --- kernel/arch/ia32xen/src/drivers/xconsole.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/drivers/xconsole.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** + * @file + * @brief ia32xen console driver. + */ + +#include +#include +#include +#include +#include + +#define MASK_INDEX(index, ring) ((index) & (sizeof(ring) - 1)) + +static bool asynchronous = false; +static void xen_putchar(chardev_t *d, const char ch); + +chardev_t xen_console; +static chardev_operations_t xen_ops = { + .write = xen_putchar +}; + +void xen_console_init(void) +{ + chardev_initialize("xen_out", &xen_console, &xen_ops); + stdout = &xen_console; + if (!(start_info.flags & SIF_INITDOMAIN)) + asynchronous = true; +} + +void xen_putchar(chardev_t *d, const char ch) +{ + if (asynchronous) { + uint32_t cons = console_page.out_cons; + uint32_t prod = console_page.out_prod; + + memory_barrier(); + + if ((prod - cons) > sizeof(console_page.out)) + return; + + if (ch == '\n') + console_page.out[MASK_INDEX(prod++, console_page.out)] = '\r'; + console_page.out[MASK_INDEX(prod++, console_page.out)] = ch; + + write_barrier(); + + console_page.out_prod = prod; + + xen_notify_remote(start_info.console_evtchn); + } else + xen_console_io(CONSOLE_IO_WRITE, 1, &ch); +} + +/** @} + */ Index: kernel/arch/ia32xen/src/fpu_context.c =================================================================== --- kernel/arch/ia32xen/src/fpu_context.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/fpu_context.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,1 @@ +../../ia32/src/fpu_context.c Index: kernel/arch/ia32xen/src/interrupt.c =================================================================== --- kernel/arch/ia32xen/src/interrupt.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/interrupt.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,192 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_interrupt + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Interrupt and exception dispatching. + */ + +void (* disable_irqs_function)(uint16_t irqmask) = NULL; +void (* enable_irqs_function)(uint16_t irqmask) = NULL; +void (* eoi_function)(void) = NULL; + +void PRINT_INFO_ERRCODE(istate_t *istate) +{ + char *symbol = get_symtab_entry(istate->eip); + + if (!symbol) + symbol = ""; + + if (CPU) + printf("----------------EXCEPTION OCCURED (cpu%d)----------------\n", CPU->id); + else + printf("----------------EXCEPTION OCCURED----------------\n"); + + printf("%%eip: %#x (%s)\n",istate->eip,symbol); + printf("ERROR_WORD=%#x\n", istate->error_word); + printf("%%cs=%#x,flags=%#x\n", istate->cs, istate->eflags); + printf("%%eax=%#x, %%ecx=%#x, %%edx=%#x, %%esp=%#x\n", istate->eax,istate->ecx,istate->edx,&istate->stack[0]); +#ifdef CONFIG_DEBUG_ALLREGS + printf("%%esi=%#x, %%edi=%#x, %%ebp=%#x, %%ebx=%#x\n", istate->esi,istate->edi,istate->ebp,istate->ebx); +#endif + printf("stack: %#x, %#x, %#x, %#x\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]); + printf(" %#x, %#x, %#x, %#x\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]); +} + +void null_interrupt(int n, istate_t *istate) +{ + fault_if_from_uspace(istate, "unserviced interrupt: %d", n); + + PRINT_INFO_ERRCODE(istate); + panic("unserviced interrupt: %d\n", n); +} + +/** General Protection Fault. */ +void gp_fault(int n, istate_t *istate) +{ + if (TASK) { + count_t ver; + + spinlock_lock(&TASK->lock); + ver = TASK->arch.iomapver; + spinlock_unlock(&TASK->lock); + + if (CPU->arch.iomapver_copy != ver) { + /* + * This fault can be caused by an early access + * to I/O port because of an out-dated + * I/O Permission bitmap installed on CPU. + * Install the fresh copy and restart + * the instruction. + */ + io_perm_bitmap_install(); + return; + } + fault_if_from_uspace(istate, "general protection fault"); + } + + PRINT_INFO_ERRCODE(istate); + panic("general protection fault\n"); +} + +void ss_fault(int n, istate_t *istate) +{ + fault_if_from_uspace(istate, "stack fault"); + + PRINT_INFO_ERRCODE(istate); + panic("stack fault\n"); +} + +void simd_fp_exception(int n, istate_t *istate) +{ + uint32_t mxcsr; + asm + ( + "stmxcsr %0;\n" + :"=m"(mxcsr) + ); + fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx", + (unative_t)mxcsr); + + PRINT_INFO_ERRCODE(istate); + printf("MXCSR: %#zx\n",(unative_t)(mxcsr)); + panic("SIMD FP exception(19)\n"); +} + +void nm_fault(int n, istate_t *istate) +{ +#ifdef CONFIG_FPU_LAZY + scheduler_fpu_lazy_request(); +#else + fault_if_from_uspace(istate, "fpu fault"); + panic("fpu fault"); +#endif +} + +void syscall(int n, istate_t *istate) +{ + panic("Obsolete syscall handler."); +} + +void tlb_shootdown_ipi(int n, istate_t *istate) +{ + trap_virtual_eoi(); + tlb_shootdown_ipi_recv(); +} + +void trap_virtual_enable_irqs(uint16_t irqmask) +{ + if (enable_irqs_function) + enable_irqs_function(irqmask); + else + panic("no enable_irqs_function\n"); +} + +void trap_virtual_disable_irqs(uint16_t irqmask) +{ + if (disable_irqs_function) + disable_irqs_function(irqmask); + else + panic("no disable_irqs_function\n"); +} + +void trap_virtual_eoi(void) +{ + if (eoi_function) + eoi_function(); + else + panic("no eoi_function\n"); + +} + +/** @} + */ Index: kernel/arch/ia32xen/src/mm/as.c =================================================================== --- kernel/arch/ia32xen/src/mm/as.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/mm/as.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + * @ingroup ia32xen_mm + */ + +#include +#include + +/** Architecture dependent address space init. */ +void as_arch_init(void) +{ + as_operations = &as_pt_operations; +} + +/** @} + */ Index: kernel/arch/ia32xen/src/mm/frame.c =================================================================== --- kernel/arch/ia32xen/src/mm/frame.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/mm/frame.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + * @ingroup ia32xen_mm + */ + +#include +#include + +void frame_arch_init(void) +{ + if (config.cpu_active == 1) { + /* The only memory zone */ + zone_create(meminfo.start, meminfo.size, meminfo.start + meminfo.reserved, 0); + frame_mark_unavailable(meminfo.start, meminfo.reserved); + } +} + +/** @} + */ Index: kernel/arch/ia32xen/src/mm/memory_init.c =================================================================== --- kernel/arch/ia32xen/src/mm/memory_init.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/mm/memory_init.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include + +size_t get_memory_size(void) +{ + return start_info.frames * PAGE_SIZE; +} + +void memory_print_map(void) +{ + printf("Xen memory: %p size: %d (reserved %d)\n", PFN2ADDR(meminfo.start), PFN2ADDR(meminfo.size - meminfo.reserved), PFN2ADDR(meminfo.reserved)); +} + +/** @} + */ Index: kernel/arch/ia32xen/src/mm/page.c =================================================================== --- kernel/arch/ia32xen/src/mm/page.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/mm/page.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void page_arch_init(void) +{ + if (config.cpu_active == 1) { + page_mapping_operations = &pt_mapping_operations; + AS_KERNEL->page_table = (pte_t *) KA2PA(start_info.ptl0); + } else + SET_PTL0_ADDRESS_ARCH(AS_KERNEL->page_table); +} + +void page_fault(int n, istate_t *istate) +{ + uintptr_t page; + pf_access_t access; + + page = read_cr2(); + + if (istate->error_word & PFERR_CODE_RSVD) + panic("Reserved bit set in page directory.\n"); + + if (istate->error_word & PFERR_CODE_RW) + access = PF_ACCESS_WRITE; + else + access = PF_ACCESS_READ; + + if (as_page_fault(page, access, istate) == AS_PF_FAULT) { + fault_if_from_uspace(istate, "Page fault: %#x", page); + + PRINT_INFO_ERRCODE(istate); + printf("page fault address: %#x\n", page); + panic("page fault\n"); + } +} + +/** @} + */ Index: kernel/arch/ia32xen/src/mm/tlb.c =================================================================== --- kernel/arch/ia32xen/src/mm/tlb.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/mm/tlb.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_mm + * @{ + */ +/** @file + * @ingroup ia32xen_mm + */ + +#include +#include +#include +#include +#include + +/** Invalidate all entries in TLB. */ +void tlb_invalidate_all(void) +{ + mmuext_op_t mmu_ext; + + mmu_ext.cmd = MMUEXT_TLB_FLUSH_LOCAL; + xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF); +} + +/** Invalidate all entries in TLB that belong to specified address space. + * + * @param asid This parameter is ignored as the architecture doesn't support it. + */ +void tlb_invalidate_asid(asid_t asid) +{ + tlb_invalidate_all(); +} + +/** Invalidate TLB entries for specified page range belonging to specified address space. + * + * @param asid This parameter is ignored as the architecture doesn't support it. + * @param page Address of the first page whose entry is to be invalidated. + * @param cnt Number of entries to invalidate. + */ +void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt) +{ + int i; + + for (i = 0; i < cnt; i++) + invlpg(page + i * PAGE_SIZE); +} + +/** @} + */ Index: kernel/arch/ia32xen/src/pm.c =================================================================== --- kernel/arch/ia32xen/src/pm.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/pm.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Early ia32xen configuration functions and data structures. + */ + +/* + * We have no use for segmentation so we set up flat mode. In this + * mode, we use, for each privilege level, two segments spanning the + * whole memory. One is for code and one is for data. + * + * One is for GS register which holds pointer to the TLS thread + * structure in it's base. + */ +descriptor_t gdt[GDT_ITEMS] = { + /* NULL descriptor */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + /* KTEXT descriptor */ + { 0xffff, 0, 0, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 1, 1, 0 }, + /* KDATA descriptor */ + { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL, 0xf, 0, 0, 1, 1, 0 }, + /* UTEXT descriptor */ + { 0xffff, 0, 0, AR_PRESENT | AR_CODE | DPL_USER, 0xf, 0, 0, 1, 1, 0 }, + /* UDATA descriptor */ + { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 }, + /* TSS descriptor - set up will be completed later */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + /* TLS descriptor */ + { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 }, +}; + +static trap_info_t traps[IDT_ITEMS + 1]; + +static tss_t tss; + +tss_t *tss_p = NULL; + +/* gdtr is changed by kmp before next CPU is initialized */ +ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((uintptr_t) gdt) }; +ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (uintptr_t) gdt }; + +void gdt_setbase(descriptor_t *d, uintptr_t base) +{ + d->base_0_15 = base & 0xffff; + d->base_16_23 = ((base) >> 16) & 0xff; + d->base_24_31 = ((base) >> 24) & 0xff; +} + +void gdt_setlimit(descriptor_t *d, uint32_t limit) +{ + d->limit_0_15 = limit & 0xffff; + d->limit_16_19 = (limit >> 16) & 0xf; +} + +void tss_initialize(tss_t *t) +{ + memsetb((uintptr_t) t, sizeof(struct tss), 0); +} + +static void trap(void) +{ +} + +void traps_init(void) +{ + index_t i; + + for (i = 0; i < IDT_ITEMS; i++) { + traps[i].vector = i; + + if (i == VECTOR_SYSCALL) + traps[i].flags = 3; + else + traps[i].flags = 0; + + traps[i].cs = XEN_CS; + traps[i].address = trap; + exc_register(i, "undef", (iroutine) null_interrupt); + } + traps[IDT_ITEMS].vector = 0; + traps[IDT_ITEMS].flags = 0; + traps[IDT_ITEMS].cs = 0; + traps[IDT_ITEMS].address = NULL; + + exc_register(13, "gp_fault", (iroutine) gp_fault); + exc_register( 7, "nm_fault", (iroutine) nm_fault); + exc_register(12, "ss_fault", (iroutine) ss_fault); + exc_register(19, "simd_fp", (iroutine) simd_fp_exception); +} + + +/* Clean IOPL(12,13) and NT(14) flags in EFLAGS register */ +static void clean_IOPL_NT_flags(void) +{ +// __asm__ volatile ( +// "pushfl\n" +// "pop %%eax\n" +// "and $0xffff8fff, %%eax\n" +// "push %%eax\n" +// "popfl\n" +// : : : "eax" +// ); +} + +/* Clean AM(18) flag in CR0 register */ +static void clean_AM_flag(void) +{ +// __asm__ volatile ( +// "mov %%cr0, %%eax\n" +// "and $0xfffbffff, %%eax\n" +// "mov %%eax, %%cr0\n" +// : : : "eax" +// ); +} + +void pm_init(void) +{ + descriptor_t *gdt_p = (descriptor_t *) gdtr.base; + +// gdtr_load(&gdtr); + + if (config.cpu_active == 1) { + traps_init(); + xen_set_trap_table(traps); + /* + * NOTE: bootstrap CPU has statically allocated TSS, because + * the heap hasn't been initialized so far. + */ + tss_p = &tss; + } else { + tss_p = (tss_t *) malloc(sizeof(tss_t), FRAME_ATOMIC); + if (!tss_p) + panic("could not allocate TSS\n"); + } + +// tss_initialize(tss_p); + + gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL; + gdt_p[TSS_DES].special = 1; + gdt_p[TSS_DES].granularity = 0; + + gdt_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p); + gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1); + + /* + * As of this moment, the current CPU has its own GDT pointing + * to its own TSS. We just need to load the TR register. + */ +// tr_load(selector(TSS_DES)); + + clean_IOPL_NT_flags(); /* Disable I/O on nonprivileged levels and clear NT flag. */ + clean_AM_flag(); /* Disable alignment check */ +} + +void set_tls_desc(uintptr_t tls) +{ + ptr_16_32_t cpugdtr; + descriptor_t *gdt_p; + + gdtr_store(&cpugdtr); + gdt_p = (descriptor_t *) cpugdtr.base; + gdt_setbase(&gdt_p[TLS_DES], tls); + /* Reload gdt register to update GS in CPU */ + gdtr_load(&cpugdtr); +} + +/** @} + */ Index: kernel/arch/ia32xen/src/proc/scheduler.c =================================================================== --- kernel/arch/ia32xen/src/proc/scheduler.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/proc/scheduler.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_proc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include /* SP_DELTA */ +#include +#include +#include +#include + +/** Perform ia32 specific tasks needed before the new task is run. + * + * Interrupts are disabled. + */ +void before_task_runs_arch(void) +{ +// io_perm_bitmap_install(); +} + +/** Perform ia32 specific tasks needed before the new thread is scheduled. + * + * THREAD is locked and interrupts are disabled. + */ +void before_thread_runs_arch(void) +{ + CPU->arch.tss->esp0 = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA]; + CPU->arch.tss->ss0 = selector(KDATA_DES); + + /* Set up TLS in GS register */ +// set_tls_desc(THREAD->arch.tls); + +#ifdef CONFIG_DEBUG_AS_WATCHPOINT + /* Set watchpoint on AS to ensure that nobody sets it to zero */ + if (CPU->id < BKPOINTS_MAX) + breakpoint_add(&((the_t *) THREAD->kstack)->as, + BKPOINT_WRITE | BKPOINT_CHECK_ZERO, + CPU->id); +#endif +} + +void after_thread_ran_arch(void) +{ +} + +/** @} + */ Index: kernel/arch/ia32xen/src/proc/task.c =================================================================== --- kernel/arch/ia32xen/src/proc/task.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/proc/task.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_proc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +/** Perform ia32 specific task initialization. + * + * @param t Task to be initialized. + */ +void task_create_arch(task_t *t) +{ + t->arch.iomapver = 0; + bitmap_initialize(&t->arch.iomap, NULL, 0); +} + +/** Perform ia32 specific task destruction. + * + * @param t Task to be initialized. + */ +void task_destroy_arch(task_t *t) +{ + if (t->arch.iomap.map) + free(t->arch.iomap.map); +} + +/** @} + */ Index: kernel/arch/ia32xen/src/proc/thread.c =================================================================== --- kernel/arch/ia32xen/src/proc/thread.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/proc/thread.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen_proc + * @{ + */ +/** @file + */ + +#include + +/** Perform ia32xen specific thread initialization. + * + * @param t Thread to be initialized. + */ +void thread_create_arch(thread_t *t) +{ + t->arch.tls = 0; +} + +/** @} + */ Index: kernel/arch/ia32xen/src/smp/apic.c =================================================================== --- kernel/arch/ia32xen/src/smp/apic.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) +++ kernel/arch/ia32xen/src/smp/apic.c (revision 57ce359ffbe02e57f3174daac33abbe9e660d9dc) @@ -0,0 +1,580 @@ +/* + * Copyright (C) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32xen + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include