foc: adjust panda timer to version A6

A6 runs at 800 not 700 MHz (as the ES2 does) when bootstrapped by U-boot

(thanks to mstein)

COPYING-GPL-2

@@ -0,0 +1,349 @@
+
+  NOTE! This License shall not affect user programs that use the micro-kernel
+API to invoke kernel-operations or services provided in other address
+spaces - this is merely considered normal use of the kernel or
+accompanying user-level services, and does not fall under the heading of
+"derivative work".
+
+-----------------------------------------------------------------------
+
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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.
+
+  <signature of Ty Coon>, 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 Lesser General
+Public License instead of this License.

kernel/fiasco/src/Kconfig

@@ -730,6 +730,14 @@ config POWERSAVE_GETCHAR
 	  prevent some P4 processors from being overheated. This option
 	  requires a working timer IRQ to wakeup getchar periodically.
 
+config USER_SINGLE_STEP
+	bool "Enable user level single stepping support"
+	depends on IA32
+	default n
+	help
+	  This option enables single stepping of user level applications outside of
+	  JDB.
+
 choice
 	prompt "Warn levels"
 	default WARN_WARNING

kernel/fiasco/src/drivers/arm/processor-arm.cpp

@@ -23,7 +23,7 @@ public:
   static Cpu_phys_id cpu_id();
 };
 
-INTERFACE[arm && !arm_em_tz]:
+INTERFACE[arm && !arm_em_tz && !arm_em_ns]:
 
 EXTENSION class Proc
 {
@@ -53,6 +53,21 @@ public:
     };
 };
 
+INTERFACE[arm && arm_em_ns]:
+
+EXTENSION class Proc
+{
+public:
+  enum : unsigned
+    {
+      Cli_mask                = Status_IRQ_disabled,
+      Sti_mask                = Status_IRQ_disabled,
+      Status_preempt_disabled = Status_IRQ_disabled,
+      Status_interrupts_mask  = Status_IRQ_disabled,
+      Status_always_mask      = Status_FIQ_disabled,
+    };
+};
+
 IMPLEMENTATION[arm]:
 
 #include "types.h"
@@ -75,7 +90,8 @@ void Proc::stack_pointer(Mword sp)
 IMPLEMENT static inline
 Mword Proc::program_counter()
 {
-  register Mword pc asm ("pc");
+  Mword pc;
+  asm ("mov %0, pc" : "=r" (pc));
   return pc;
 }
 

kernel/fiasco/src/jdb/jdb_kobject_names.cpp

@@ -43,7 +43,7 @@ IMPLEMENTATION:
 
 enum
 {
-  Name_buffer_size = 8192,
+  Name_buffer_size = 4*8192,
   Name_entries = Name_buffer_size / sizeof(Jdb_kobject_name),
 };
 

kernel/fiasco/src/kern/arm/bsp/imx/Kconfig

@@ -43,6 +43,13 @@ config PF_IMX_6
         help
           Choose for i.MX6 platform.
 
+config PF_IMX_53
+	bool "i.MX53"
+	depends on PF_IMX
+	select CAN_ARM_CPU_CORTEX_A8
+	help
+	  Choose for i.MX53
+
 endchoice
 
 config PF_IMX_RAM_PHYS_BASE
@@ -50,4 +57,5 @@ config PF_IMX_RAM_PHYS_BASE
 	default 0xc0000000 if PF_IMX_21
 	default 0x80000000 if PF_IMX_35
 	default 0x90000000 if PF_IMX_51
-        default 0x10000000 if PF_IMX_6
+	default 0x70000000 if PF_IMX_53
+	default 0x10000000 if PF_IMX_6

kernel/fiasco/src/kern/arm/bsp/imx/Modules

@@ -9,10 +9,12 @@ PREPROCESS_PARTS	+= $(if $(CONFIG_PF_IMX_51),imx51 imx_epit \
                                                     pic_gic pic_gic_mxc_tzic)
 PREPROCESS_PARTS	+= $(if $(CONFIG_PF_IMX_53),imx53 imx_epit \
                                                     pic_gic pic_gic_mxc_tzic)
+
 PREPROCESS_PARTS        += $(if $(CONFIG_PF_IMX_6),imx6 pic_gic mptimer)
 RAM_PHYS_BASE           := $(CONFIG_PF_IMX_RAM_PHYS_BASE)
 
 INTERFACES_KERNEL     += $(if $(CONFIG_PF_IMX_51),gic)
+INTERFACES_KERNEL     += $(if $(CONFIG_PF_IMX_53),gic)
 INTERFACES_KERNEL     += $(if $(CONFIG_PF_IMX_6),gic)
 INTERFACES_KERNEL-$(CONFIG_PF_IMX_35) += timer_imx_epit
 INTERFACES_KERNEL-$(CONFIG_PF_IMX_51) += timer_imx_epit
@@ -28,6 +30,7 @@ pic_IMPL              += $(if $(CONFIG_PF_IMX_35),pic-arm-imx)
 pic_IMPL              += $(if $(CONFIG_PF_IMX_51),pic-gic pic-arm-imx51)
 pic_IMPL              += $(if $(CONFIG_PF_IMX_53),pic-gic pic-arm-imx51)
 pic_IMPL              += $(if $(CONFIG_PF_IMX_6),pic-gic pic-arm-imx51)
+
 bootstrap_IMPL        += bootstrap-arm-imx
 timer_IMPL            += $(if $(CONFIG_PF_IMX_21),timer-arm-imx21)
 timer_IMPL            += $(if $(CONFIG_PF_IMX_35),timer-arm-imx_epit)

kernel/fiasco/src/kern/arm/bsp/imx/mem_layout-arm-imx.cpp

@@ -83,3 +83,4 @@ public:
     Uart_phys_base       = Uart2_phys_base,
   };
 };
+

kernel/fiasco/src/kern/arm/bsp/omap/timer-arm-mptimer-omap4.cpp

@@ -4,5 +4,13 @@ INTERFACE [arm && mptimer && omap4_pandaboard]:
 EXTENSION class Timer
 {
 private:
-  static Mword interval() { return 499999; }
+  static Mword interval()
+  {
+    /*
+     * This is only valid for Panda A6, as we run it at our offices. For A6
+     * U-Boot will clock the board at 800 MHz leading to a 400 MHz private timer
+     * tick.
+     */
+    return 399999;
+  }
 };

kernel/fiasco/src/kern/arm/cpu-arm.cpp

@@ -40,6 +40,7 @@ public:
     Copro_dbg_model_v6            = 2,
     Copro_dbg_model_v6_1          = 3,
     Copro_dbg_model_v7            = 4,
+    Copro_dbg_model_v7_1          = 5,
   };
 
   unsigned copro_dbg_model() const { return _cpu_id._dfr0 & 0xf; }
@@ -498,7 +499,7 @@ Cpu::id_init()
 }
 
 //---------------------------------------------------------------------------
-IMPLEMENTATION [!arm_cpu_errata || !armv6plus]:
+IMPLEMENTATION [!arm_cpu_errata || !armv6plus || omap4_pandaboard]:
 
 PRIVATE static inline
 void Cpu::init_errata_workarounds() {}
@@ -559,8 +560,8 @@ Cpu::init_errata_workarounds()
           if (rev == 0x20 || rev == 0x21 || rev == 0x22)
             set_c15_c0_1((1 << 12) | (1 << 22));
 
-          // errata: 743622
-          if ((rev & 0xf0) == 0x20)
+          // errata: 743622 (r2p0 - r2p2)
+          if ((rev & 0xf0) == 0x20 && (rev & 0xf) < 0x3)
             set_c15_c0_1(1 << 6);
 
           // errata: 751472

kernel/fiasco/src/kern/arm/mem_op.cpp

@@ -113,7 +113,7 @@ Mem_op::arm_mem_cache_maint(int op, void const *start, void const *end)
 
     case Op_cache_dma_coherent:
         {
-          Mem_unit::flush_dcache(Virt_addr(Address(start)), Virt_addr(Address(end)));
+          Mem_unit::flush_dcache(start, end);
           outer_cache_op(Op_cache_l2_flush, Address(start), Address(end));
         }
       break;

kernel/fiasco/src/kern/arm/perf_cnt-arm.cpp

@@ -261,6 +261,7 @@ Perf_cnt::init_cpu()
   //set_event_type(0, EVENT_EXTMEM_TRANSFER_READ);
   //set_event_type(1, EVENT_EXTMEM_TRANSFER_WRITE);
 
+
 #if 0
   set_event_type(3, EVENT_EXTMEM_TRANSFER_READ);
   set_event_type(4, EVENT_LINE_MIGRATION);
@@ -296,7 +297,8 @@ int Perf_cnt::_nr_counters;
 PRIVATE static
 bool
 Perf_cnt::is_avail()
-{ return Cpu::boot_cpu()->copro_dbg_model() == Cpu::Copro_dbg_model_v7; }
+{ return Cpu::boot_cpu()->copro_dbg_model() == Cpu::Copro_dbg_model_v7 ||
+         Cpu::boot_cpu()->copro_dbg_model() == Cpu::Copro_dbg_model_v7_1; }
 
 PRIVATE static
 void

kernel/fiasco/src/kern/arm/sys_call_page-arm.cpp

@@ -43,8 +43,8 @@ Sys_call_page::init()
                               Vmem_alloc::NO_ZERO_FILL, Vmem_alloc::User))
     panic("FIASCO: can't allocate system-call page.\n");
 
-  for (unsigned i = 0; i < Config::PAGE_SIZE; i += sizeof(Mword))
-    *(sys_calls++) = 0xef000000; // svc
+  for (unsigned i = 0; i < Config::PAGE_SIZE / sizeof(Mword); i++)
+    sys_calls[i] = 0xef000000; // svc
 
   set_utcb_get_code((Mword*)(Mem_layout::Syscalls + 0xf00));
 

kernel/fiasco/src/kern/arm/thread-arm.cpp

@@ -316,6 +316,10 @@ extern "C" {
             if (handle_copro_fault[copro](opcode, ts))
               return;
           }
+
+        /* check for ARM default GDB breakpoint */
+        if (!(ts->psr & Proc::Status_thumb) && opcode == 0xe7ffdefe)
+          ts->pc -= 4;
       }
 
 undef_insn:
@@ -415,7 +419,7 @@ Thread::user_ip() const
 IMPLEMENT inline
 Mword
 Thread::user_flags() const
-{ return 0; }
+{ return state() & Thread_ready; }
 
 IMPLEMENT inline NEEDS[Thread::exception_triggered]
 void
@@ -501,7 +505,17 @@ Thread::copy_utcb_to_ts(L4_msg_tag const &tag, Thread *snd, Thread *rcv,
     }
   else
     {
-      Mem::memcpy_mwords (ts, snd_utcb->values, s > 19 ? 19 : s);
+      /*
+       * copy R0..R12,SP,LR,PC,PSR (UTCB Mwords 3..15,16,17,19,20)
+       * don't allow to overwrite pf_address, error_code, tpidruro, km_lr
+       * (these might have changed in the kernel without the Genode exception
+       *  handler knowing about it, so it could try to restore outdated values)
+       */
+      Mem::memcpy_mwords (&ts->r[0], &snd_utcb->values[3], s > 15 ? 13 : s);
+      if (EXPECT_TRUE(s > 16))
+          ts->usp = snd_utcb->values[16];
+      if (EXPECT_TRUE(s > 17))
+          ts->ulr = snd_utcb->values[17];
       if (EXPECT_TRUE(s > 19))
 	ts->pc = snd_utcb->values[19];
       if (EXPECT_TRUE(s > 20))
@@ -614,6 +628,10 @@ Thread::condition_valid(Unsigned32 insn, Unsigned32 psr)
   return (v[insn >> 28] >> (psr >> 28)) & 1;
 }
 
+IMPLEMENT inline
+void Thread::user_single_step(bool)
+{}
+
 // ------------------------------------------------------------------------
 IMPLEMENTATION [arm && armv6plus]:
 

kernel/fiasco/src/kern/arm/tramp-mp.S

@@ -59,7 +59,7 @@ _tramp_mp_entry:
 	msr   cpsr_c, r0
 
 	// enable SMP
-#ifndef CONFIG_ARM_EM_NS
+#if !defined(CONFIG_ARM_EM_NS) && !defined(CONFIG_ARM_CORTEX_A15)
 	adr   r0, .Lmpcore_phys_base
 	ldr   r0, [r0]
 	ldr   r1, [r0]

kernel/fiasco/src/kern/config.cpp

@@ -246,8 +246,8 @@ void Config::init()
     esc_hack = true;
 
 #ifdef CONFIG_SERIAL
-  if (    Koptions::o()->opt(Koptions::F_serial_esc)
-      && !Koptions::o()->opt(Koptions::F_noserial)
+  if (    /*Koptions::o()->opt(Koptions::F_serial_esc)
+      &&*/ !Koptions::o()->opt(Koptions::F_noserial)
 # ifdef CONFIG_KDB
       &&  Koptions::o()->opt(Koptions::F_nokdb)
 # endif

kernel/fiasco/src/kern/ia32/32/entry-native.S

@@ -46,6 +46,30 @@
 	jmp	slowtraps
 .endm
 
+#ifdef CONFIG_USER_SINGLE_STEP
+.macro HANDLE_USER_TRAP1
+	/* Save EFLAGS, this may trap if user task had single stepping activated
+	 * test for single stepping
+	 */
+	pushf
+	addl	$4, %esp
+	testl	$EFLAGS_TF, -4(%esp)
+.endm
+
+.macro RESTORE_USER_TRAP1
+	/* Restore single stepping if it has been set */
+	je 1f
+	orl $EFLAGS_TF, (%esp)
+1:
+.endm
+#else
+.macro HANDLE_USER_TRAP1
+.endm
+
+.macro RESTORE_USER_TRAP1
+.endm
+#endif
+
 	.p2align 4
 	.globl	entry_vec01_debug
 entry_vec01_debug:
@@ -59,6 +83,15 @@ entry_vec01_debug:
 	cmpl	$entry_sys_fast_ipc_log, (%esp)
 	je	2f
 #endif
+
+	/* test if trap was raised within kernel */
+	testl $3, 4(%esp)
+	jne   1f
+
+	/* turn of EFLAGS.TF */
+	btrl $7, 8(%esp) 
+	iret
+
 1:	pushl	$0
 	pushl	$1
 	pusha
@@ -226,10 +259,16 @@ alien_sys_fast_ipc_log:
 	.p2align(4)
 	.global entry_sys_fast_ipc_c
 entry_sys_fast_ipc_c:
+
+	HANDLE_USER_TRAP1
+
 	pop	%esp
 	pushl	$(GDT_DATA_USER|SEL_PL_U)	/* user ss */
 	pushl	%ebp				// push user SP (get in ebp)
 	pushf                                   // fake user eflags
+
+	RESTORE_USER_TRAP1
+
 	cld
 	// Fake user cs. This cs value is never used with exception
 	// that the thread is ex_regs'd before we leave with sysexit.

kernel/fiasco/src/kern/ia32/32/thread-ia32-32.cpp

@@ -79,6 +79,7 @@ Thread::copy_utcb_to_ts(L4_msg_tag const &tag, Thread *snd, Thread *rcv,
   Trap_state *ts = (Trap_state*)rcv->_utcb_handler;
   Mword       s  = tag.words();
   Unsigned32  cs = ts->cs();
+  Unsigned32  eflags_tf = ts->flags() & EFLAGS_TF;
   Utcb *snd_utcb = snd->utcb().access();
 
   // XXX: check that gs and fs point to valid user_entry only, for gdt and
@@ -110,6 +111,13 @@ Thread::copy_utcb_to_ts(L4_msg_tag const &tag, Thread *snd, Thread *rcv,
   // don't allow to overwrite the code selector!
   ts->cs(cs);
 
+  /*
+   * don't allow to overwrite the single-step flag
+   * (it might have changed in the kernel without the Genode exception handler
+   *  knowing about it, so it could try to restore an outdated value)
+   */
+  ts->flags((ts->flags() & ~EFLAGS_TF) | eflags_tf);
+
   bool ret = transfer_msg_items(tag, snd, snd_utcb,
                                 rcv, rcv->utcb().access(), rights);
 

kernel/fiasco/src/kern/ia32/64/entry.S

@@ -414,6 +414,7 @@ GATE_INITTAB_END
 	.p2align
 	.globl	leave_by_trigger_exception
 leave_by_trigger_exception:
+	cli
         sub $40, %rsp
 	pushq	$0x00
 	pushq	$0xff

kernel/fiasco/src/kern/ia32/config-ia32.cpp

@@ -86,6 +86,12 @@ public:
 //  static const bool hlt_works_ok = false;
   static bool hlt_works_ok;
 
+#ifdef CONFIG_USER_SINGLE_STEP
+  static const bool user_single_step = true;
+#else
+  static const bool user_single_step = false;
+#endif
+
   // the default uart to use for serial console
   static const unsigned default_console_uart = 1;
   static const unsigned default_console_uart_baudrate = 115200;

kernel/fiasco/src/kern/ia32/thread-ia32.cpp

@@ -92,7 +92,10 @@ Thread::user_ip() const
 IMPLEMENT inline
 Mword
 Thread::user_flags() const
-{ return regs()->flags(); }
+{
+    // pass thread-ready state in carry flag (Thread_ready is bit 0)
+    return (regs()->flags() & ~Thread_ready) | (state() & Thread_ready);
+}
 
 /** Check if the pagefault occured at a special place: At some places in the
     kernel we want to ensure that a specific address is mapped. The regular
@@ -188,6 +191,10 @@ Thread::handle_slow_trap(Trap_state *ts)
       goto generic_debug;
     }
 
+  if (Config::user_single_step && ts->_trapno == 1 && from_user)
+    if (send_exception(ts))
+      goto success;
+
   if (from_user && _space.user_mode())
     {
       if (ts->_trapno == 14 && Kmem::is_io_bitmap_page_fault(ts->_cr2))
@@ -428,7 +435,8 @@ Thread::send_exception_arch(Trap_state *ts)
   // thread (not alien) and it's a debug trap,
   // debug traps for aliens are always reflected as exception IPCs
   if (!(state() & Thread_alien)
-      && (ts->_trapno == 1 || ts->_trapno == 3))
+      && ((ts->_trapno == 1 && !Config::user_single_step)
+      ||   ts->_trapno == 3))
     return 0; // we do not handle this
 
   if (ts->_trapno == 3)
@@ -500,6 +508,11 @@ Thread::user_ip(Mword ip)
     }
 }
 
+IMPLEMENT inline
+void
+Thread::user_single_step(bool)
+{}
+
 //----------------------------------------------------------------------------
 IMPLEMENTATION [(ia32,amd64,ux) && !io]:
 
@@ -852,3 +865,16 @@ PRIVATE static inline
 int
 Thread::call_nested_trap_handler(Trap_state *)
 { return -1; }
+
+//---------------------------------------------------------------------------
+IMPLEMENTATION [ia32]:
+
+IMPLEMENT inline
+void
+Thread::user_single_step(bool enable)
+{
+  if (!Config::user_single_step)
+    return;
+
+  regs()->flags(enable ? user_flags() | EFLAGS_TF : user_flags() & ~EFLAGS_TF);
+}

kernel/fiasco/src/kern/kernel_thread.cpp

@@ -181,6 +181,7 @@ Kernel_thread::idle_op()
       arch_tickless_idle(cpu);
 
       enable_tlb(cpu);
+      Mem_unit::tlb_flush();
       Rcu::leave_idle(cpu);
       Timer_tick::enable(cpu);
     }

kernel/fiasco/src/kern/ppc32/thread-ppc32.cpp

@@ -306,6 +306,10 @@ Thread::user_ip(Mword ip)
     }
 }
 
+IMPLEMENT inline
+void Thread::user_single_step(bool)
+{}
+
 PUBLIC inline NEEDS ["trap_state.h"]
 int
 Thread::send_exception_arch(Trap_state * /*ts*/)

kernel/fiasco/src/kern/task.cpp

@@ -494,10 +494,12 @@ Task::sys_caps_equal(Syscall_frame *, Utcb *utcb)
   if (obj_a.special() || obj_b.special())
     return commit_result(obj_a.special_cap() == obj_b.special_cap());
 
-  Obj_space::Capability c_a = lookup(obj_a.cap());
-  Obj_space::Capability c_b = lookup(obj_b.cap());
+  Kobject_iface* ki_a = lookup(obj_a.cap()).obj();
+  Kobject_iface* ki_b = lookup(obj_b.cap()).obj();
+  Address a_a = ki_a ? ki_a->kobject_start_addr() : 0;
+  Address a_b = ki_b ? ki_b->kobject_start_addr() : 0;
 
-  return commit_result(c_a == c_b);
+  return commit_result(a_a == a_b);
 }
 
 PRIVATE inline NOEXPORT

kernel/fiasco/src/kern/thread.cpp

@@ -73,6 +73,7 @@ public:
   {
     Exr_cancel            = 0x10000,
     Exr_trigger_exception = 0x20000,
+    Exr_single_step       = 0x40000,
   };
 
   enum Vcpu_ctl_flags
@@ -140,6 +141,8 @@ public:
 
   inline Mword user_flags() const;
 
+  inline void user_single_step(bool);
+
   /** nesting level in debugger (always critical) if >1 */
   static Per_cpu<unsigned long> nested_trap_recover;
   static void handle_remote_requests_irq() asm ("handle_remote_cpu_requests");

kernel/fiasco/src/kern/thread_object.cpp

@@ -529,6 +529,8 @@ Thread_object::ex_regs(Address ip, Address sp,
   if (o_ip) *o_ip = user_ip();
   if (o_flags) *o_flags = user_flags();
 
+  (ops & Exr_single_step) ? user_single_step(true) : user_single_step(false);
+
   // Changing the run state is only possible when the thread is not in
   // an exception.
   if (!(ops & Exr_cancel) && (state() & Thread_in_exception))

kernel/fiasco/src/kern/vkey.cpp

@@ -31,6 +31,7 @@ IMPLEMENTATION [debug && serial && !ux]:
 #include "globals.h"
 #include "kernel_console.h"
 #include "keycodes.h"
+#include "koptions.h"
 #include "uart.h"
 
 static Vkey::Echo_type vkey_echo;
@@ -116,7 +117,7 @@ Vkey::check_()
       if (c == -1)
 	break;
 
-      if (c == KEY_ESC)
+      if ((c == KEY_ESC) && (Koptions::o()->opt(Koptions::F_serial_esc)))
 	{
 	  ret = 0;  // break into kernel debugger
 	  break;

kernel/fiasco/src/kern/vlog.cpp

@@ -51,9 +51,8 @@ FIASCO_DEFINE_KOBJ(Vlog);
 PUBLIC
 Vlog::Vlog()
 : _irq(0),
-  _i_flags(F_ICRNL), _o_flags(F_ONLCR), _l_flags(F_ECHO)
+  _i_flags(F_ICRNL), _o_flags(F_ONLCR), _l_flags(0)
 {
-  Vkey::set_echo(Vkey::Echo_crnl);
   // CAP idx 5 is the initial kernel stream
   initial_kobjects.register_obj(this, 5);
 }

l4/Makefile

@@ -290,13 +290,13 @@ Makeconf.bid.local-helper:
 
 Makeconf.bid.local-internal-names:
 ifneq ($(CONFIG_INT_CPP_NAME_SWITCH),)
-	$(VERBOSE) set -e; X="tmp.$$$$$$RANDOM.c" ; echo 'int main(void){}'>$$X ; \
+	$(VERBOSE) set -e; X="$(OBJ_DIR)/tmp.$$$$$$RANDOM.c" ; echo 'int main(void){}'>$$X ; \
 		rm -f $$X.out ; $(LD_GENDEP_PREFIX) GENDEP_SOURCE=$$X \
 		GENDEP_OUTPUT=$$X.out $(CC) $(CCXX_FLAGS) -c $$X -o $$X.o; \
 		test -e $$X.out; echo INT_CPP_NAME=`cat $$X.out` \
 			>>$(DROPSCONF_CONFIG_MK); \
 		rm -f $$X $$X.{o,out};
-	$(VERBOSE)set -e; X="tmp.$$$$$$RANDOM.cc" ; echo 'int main(void){}'>$$X; \
+	$(VERBOSE)set -e; X="$(OBJ_DIR)/tmp.$$$$$$RANDOM.cc" ; echo 'int main(void){}'>$$X; \
 		rm -f $$X.out; $(LD_GENDEP_PREFIX) GENDEP_SOURCE=$$X \
 		GENDEP_OUTPUT=$$X.out $(CXX) -c $$X -o $$X.o; \
 		test -e $$X.out; echo INT_CXX_NAME=`cat $$X.out` \
@@ -393,7 +393,6 @@ define switch_ram_base_func
 	echo "# File semi-automatically generated by 'make switch_ram_base'" > $(OBJ_BASE)/Makeconf.ram_base; \
 	echo "RAM_BASE := $(1)"                                             >> $(OBJ_BASE)/Makeconf.ram_base; \
 	PWD=$(PWD)/pkg/sigma0/server/src $(MAKE) RAM_BASE=$(1) -C pkg/sigma0/server/src;                      \
-	PWD=$(PWD)/pkg/moe/server/src    $(MAKE) RAM_BASE=$(1) -C pkg/moe/server/src;                         \
 	echo "RAM_BASE_SWITCH_OK := yes"                                    >> $(OBJ_BASE)/Makeconf.ram_base
 endef
 

l4/mk/platforms/imx53.conf

@@ -0,0 +1,4 @@
+PLATFORM_NAME        = "Freescale i.MX53"
+PLATFORM_ARCH        = arm
+PLATFORM_RAM_BASE    = 0x70000000
+PLATFORM_RAM_SIZE_MB = 1024

l4/pkg/bootstrap/server/src/Makefile.platform

@@ -17,6 +17,7 @@ SUPPORT_CC_arm-imx21           := platform/imx.cc
 DEFAULT_RELOC_arm-imx21        := 0x00200000  # because of blob
 SUPPORT_CC_arm-imx35           := platform/imx.cc
 SUPPORT_CC_arm-imx51           := platform/imx.cc
+SUPPORT_CC_arm-imx53           := platform/imx.cc 
 SUPPORT_CC_arm-imx6            := platform/imx.cc
 SUPPORT_CC_arm-om              := platform/om.cc
 SUPPORT_CC_arm-kirkwood        := platform/kirkwood.cc

l4/pkg/bootstrap/server/src/platform/exynos.cc

@@ -17,8 +17,6 @@
 #include "support.h"
 #include <l4/drivers/uart_s3c2410.h>
 
-#include <cstdio>
-
 namespace {
 class Platform_arm_exynos : public Platform_single_region_ram
 {

l4/pkg/bootstrap/server/src/platform/imx.cc

@@ -36,6 +36,9 @@ class Platform_arm_imx : public Platform_single_region_ram
 #elif defined(PLATFORM_TYPE_imx51)
     static L4::Io_register_block_mmio r(0x73fbc000);
     static L4::Uart_imx51 _uart;
+#elif defined(PLATFORM_TYPE_imx53)
+    static L4::Io_register_block_mmio r(0x53fbc000);
+    static L4::Uart_imx51 _uart;
 #elif defined(PLATFORM_TYPE_imx6)
     //static L4::Io_register_block_mmio r(0x02020000); // UART1
     static L4::Io_register_block_mmio r(0x021e8000); // UART2

l4/pkg/bootstrap/server/src/platform/x86_pc.cc

@@ -612,8 +612,15 @@ public:
             printf("PCI IO port = %x\n", comport);
           }
 
-        if (comport == -1)
-          comport = 1;
+        if (comport == -1) {
+          /* try to read Bios Data Area (BDA) to get comport information */
+          unsigned short comport_count = (*((unsigned short *)0x410) >> 9) & 0x7;
+          if (comport_count)
+            comport = *((unsigned short *)0x400);
+          else
+            /* give up and try default values */
+            comport = 1;
+		}
 
         if (init_uart(comport, comirq, &du))
           printf("UART init failed\n");

l4/pkg/sigma0/server/src/Makefile

@@ -9,7 +9,7 @@ REQUIRES_LIBS        = libc_minimal cxx_util cxx_io cxx_base \
 DEFINES             += -DL4_MINIMAL_LIBC
 DEFAULT_RELOC_x86   := 0x00100000
 DEFAULT_RELOC_amd64 := 0x00100000
-DEFAULT_RELOC_arm   := 0x00090000
+DEFAULT_RELOC_arm   := 0x000a0000
 DEFAULT_RELOC_sparc := 0x01200000
 DEFAULT_RELOC_ppc32 := 0x00100000
 RELOC_PHYS          := y

l4/pkg/sigma0/server/src/init.cc

@@ -27,6 +27,7 @@
 #include "ioports.h"
 #include "mem_man_test.h"
 #include <l4/sys/debugger.h>
+#include <l4/sys/scheduler.h>
 
 /* started as the L4 sigma0 task from crt0.S */
 
@@ -61,6 +62,10 @@ init(l4_kernel_info_t *info)
   l4_debugger_set_object_name(L4_BASE_FACTORY_CAP, "root factory");
   l4_debugger_set_object_name(L4_BASE_THREAD_CAP,  "sigma0");
 
+  l4_sched_param_t params = l4_sched_param(255);
+  l4_scheduler_run_thread(L4_BASE_SCHEDULER_CAP, L4_BASE_THREAD_CAP, &params);
+
+
   Page_alloc_base::init();
 
   init_memory(info);

l4/pkg/sigma0/server/src/ioports_x86.cc

@@ -39,8 +39,9 @@ void handle_io_page_fault(l4_umword_t t, l4_utcb_t *utcb, Answer *a)
   size = l4_fpage_size(fp) + PORT_SHIFT;
 
   unsigned long i = io_ports.alloc(Region::bs(port, 1UL << size, t));
-  if (i == port)
+  if (i == port) {
     a->snd_fpage(l4_iofpage(port >> PORT_SHIFT, size - PORT_SHIFT));
-  else
+    a->tag = l4_msgtag(0, 0, 1, 0);
+  } else
     a->error(L4_ENOMEM);
 }