From patchwork Tue Oct 9 22:29:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] hw/armv7m_nvic: Implement byte read/write for NVIC SCB_SHPRx registers Date: Tue, 09 Oct 2012 12:29:15 -0000 From: Andre Beckus X-Patchwork-Id: 190588 Message-Id: <1349821756-23125-1-git-send-email-mikemail98-qemu@yahoo.com> To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Andre Beckus Adds nvic_writeb and nvic_readb functions. Implements byte read/write for the NVIC SCB_SHPRx (System Handler Priority Registers). Currently, only double word access is implemented. The ARM CMSIS library maps these registers to a byte array, which requires that byte access be implemented. Note that because the NVIC ID register read handles both byte and word reads, it is left as-is, and not moved into the new nvic_readb function. Signed-off-by: Andre Beckus --- hw/armv7m_nvic.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index 5c09116..10b5954 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -138,6 +138,26 @@ void armv7m_nvic_complete_irq(void *opaque, int irq) gic_complete_irq(&s->gic, 0, irq); } +static uint32_t nvic_readb(void *opaque, uint32_t offset) +{ + nvic_state *s = (nvic_state *)opaque; + uint32_t val; + int irq; + + if (offset < 0xd18) { + goto bad_reg; + } else if (offset < 0xd24) { + irq = offset - 0xd14; + val = s->gic.priority1[irq][0]; + } else { + goto bad_reg; + } + return val; +bad_reg: + hw_error("NVIC: Bad read offset 0x%x\n", offset); + return 0; +} + static uint32_t nvic_readl(void *opaque, uint32_t offset) { nvic_state *s = (nvic_state *)opaque; @@ -285,6 +305,25 @@ static uint32_t nvic_readl(void *opaque, uint32_t offset) } } +static void nvic_writeb(void *opaque, uint32_t offset, uint32_t value) +{ + nvic_state *s = (nvic_state *)opaque; + int irq; + + if (offset < 0xd18) { + goto bad_reg; + } else if (offset < 0xd24) { + irq = offset - 0xd14; + s->gic.priority1[irq][0] = value; + gic_update(&s->gic); + } else { + goto bad_reg; + } + return; +bad_reg: + hw_error("NVIC: Bad read offset 0x%x\n", offset); +} + static void nvic_writel(void *opaque, uint32_t offset, uint32_t value) { nvic_state *s = (nvic_state *)opaque; @@ -408,6 +447,8 @@ static uint64_t nvic_sysreg_read(void *opaque, target_phys_addr_t addr, } if (size == 4) { return nvic_readl(opaque, offset); + } else if (size == 1) { + return nvic_readb(opaque, offset); } hw_error("NVIC: Bad read of size %d at offset 0x%x\n", size, offset); } @@ -419,6 +460,9 @@ static void nvic_sysreg_write(void *opaque, target_phys_addr_t addr, if (size == 4) { nvic_writel(opaque, offset, value); return; + } else if (size == 1) { + nvic_writeb(opaque, offset, value); + return; } hw_error("NVIC: Bad write of size %d at offset 0x%x\n", size, offset); }