On 11/07/2011 07:25 AM, Peter Maydell wrote:
Fix a long-standing bug which meant that any attempt to do an
8 or 16 bit read from the OMAP GPIO module would cause qemu to
crash due to an infinite recursion.

Signed-off-by: Peter Maydell<peter.mayd...@linaro.org>

Applied.  Thanks.

Regards,

Anthony Liguori

---
This has actually been in the code since the original OMAP2 support
was added in 2008; we've never noticed before because the kernel happened
to always do 32 bit accesses...
Long term we should fix this by conversion to MemoryRegion; this is
the minimally invasive fix for 1.0.

  hw/omap_gpio.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/omap_gpio.c b/hw/omap_gpio.c
index d775df6..d630748 100644
--- a/hw/omap_gpio.c
+++ b/hw/omap_gpio.c
@@ -510,7 +510,7 @@ static void omap2_gpio_module_write(void *opaque, 
target_phys_addr_t addr,

  static uint32_t omap2_gpio_module_readp(void *opaque, target_phys_addr_t addr)
  {
-    return omap2_gpio_module_readp(opaque, addr)>>  ((addr&  3)<<  3);
+    return omap2_gpio_module_read(opaque, addr&  ~3)>>  ((addr&  3)<<  3);
  }

  static void omap2_gpio_module_writep(void *opaque, target_phys_addr_t addr,


Reply via email to