[Qemu-devel] [PATCH v4 0/4] Improve handling of GICD_ICFGR

[Qemu-devel] [PATCH v4 0/4] Improve handling of GICD_ICFGR

[Adam Lackorzynski]

The following patches address the behavior of the GICD_ICFGR register
in the ARM GIC.

Changes to v3:
 - Tag patchset with proper version

Changes to v2:
 - Replace 16 with GIC_NR_SGIS in setup

Changes to v1:                                                                      
 - Setting of model mode only for old GIC revisions                                               
 - Less invasive change for PPI settings                                                          

Adam Lackorzynski (4):
  arm_gic: Fix read of GICD_ICFGR
  arm_gic: GICD_ICFGR: Write model only for pre v1 GICs
  arm_gic: Do not force PPIs to edge-triggered mode
  arm_gic: Use GIC_NR_SGIS constant

 hw/intc/arm_gic.c        | 14 ++++++++------
 hw/intc/arm_gic_common.c |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

-- 
2.1.0.rc1

[Qemu-devel] [PATCH v4 1/4] arm_gic: Fix read of GICD_ICFGR

[Adam Lackorzynski]

The GICD_ICFGR register covers 4 interrupts per byte.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
---
 hw/intc/arm_gic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 1532ef9..d2b1aaf 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -372,7 +372,7 @@ static uint32_t gic_dist_readb(void *opaque, hwaddr offset)
         }
     } else if (offset < 0xf00) {
         /* Interrupt Configuration.  */
-        irq = (offset - 0xc00) * 2 + GIC_BASE_IRQ;
+        irq = (offset - 0xc00) * 4 + GIC_BASE_IRQ;
         if (irq >= s->num_irq)
             goto bad_reg;
         res = 0;
-- 
2.1.0.rc1

[Qemu-devel] [PATCH v4 2/4] arm_gic: GICD_ICFGR: Write model only for pre v1 GICs

[Adam Lackorzynski]

Setting the model is only available in pre-v1 GIC models.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
---
 hw/intc/arm_gic.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index d2b1aaf..e546647 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -561,10 +561,12 @@ static void gic_dist_writeb(void *opaque, hwaddr offset,
         if (irq < GIC_INTERNAL)
             value |= 0xaa;
         for (i = 0; i < 4; i++) {
-            if (value & (1 << (i * 2))) {
-                GIC_SET_MODEL(irq + i);
-            } else {
-                GIC_CLEAR_MODEL(irq + i);
+            if (s->revision == REV_11MPCORE || s->revision == REV_NVIC) {
+                if (value & (1 << (i * 2))) {
+                    GIC_SET_MODEL(irq + i);
+                } else {
+                    GIC_CLEAR_MODEL(irq + i);
+                }
             }
             if (value & (2 << (i * 2))) {
                 GIC_SET_EDGE_TRIGGER(irq + i);
-- 
2.1.0.rc1

[Qemu-devel] [PATCH v4 3/4] arm_gic: Do not force PPIs to edge-triggered mode

[Adam Lackorzynski]

Only SGIs must be WI, done by forcing them to their default
(edge-triggered).

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
---
 hw/intc/arm_gic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index e546647..55019c9 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -558,7 +558,7 @@ static void gic_dist_writeb(void *opaque, hwaddr offset,
         irq = (offset - 0xc00) * 4 + GIC_BASE_IRQ;
         if (irq >= s->num_irq)
             goto bad_reg;
-        if (irq < GIC_INTERNAL)
+        if (irq < GIC_NR_SGIS)
             value |= 0xaa;
         for (i = 0; i < 4; i++) {
             if (s->revision == REV_11MPCORE || s->revision == REV_NVIC) {
-- 
2.1.0.rc1

[Qemu-devel] [PATCH v4 4/4] arm_gic: Use GIC_NR_SGIS constant

[Adam Lackorzynski]

Use constant rather than a plain number.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
---
 hw/intc/arm_gic_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
index 6d884ec..18b01ba 100644
--- a/hw/intc/arm_gic_common.c
+++ b/hw/intc/arm_gic_common.c
@@ -128,7 +128,7 @@ static void arm_gic_common_reset(DeviceState *dev)
         s->running_priority[i] = 0x100;
         s->cpu_enabled[i] = false;
     }
-    for (i = 0; i < 16; i++) {
+    for (i = 0; i < GIC_NR_SGIS; i++) {
         GIC_SET_ENABLED(i, ALL_CPU_MASK);
         GIC_SET_EDGE_TRIGGER(i);
     }
-- 
2.1.0.rc1

Re: [Qemu-devel] [PATCH v4 0/4] Improve handling of GICD_ICFGR

[Adam Lackorzynski]

On Mon Aug 18, 2014 at 16:30:51 +0200, Adam Lackorzynski wrote:
> The following patches address the behavior of the GICD_ICFGR register
> in the ARM GIC.

Any takers or comments?


> Changes to v3:
>  - Tag patchset with proper version
> 
> Changes to v2:
>  - Replace 16 with GIC_NR_SGIS in setup
> 
> Changes to v1:                                                                      
>  - Setting of model mode only for old GIC revisions                                               
>  - Less invasive change for PPI settings                                                          
> 
> Adam Lackorzynski (4):
>   arm_gic: Fix read of GICD_ICFGR
>   arm_gic: GICD_ICFGR: Write model only for pre v1 GICs
>   arm_gic: Do not force PPIs to edge-triggered mode
>   arm_gic: Use GIC_NR_SGIS constant
> 
>  hw/intc/arm_gic.c        | 14 ++++++++------
>  hw/intc/arm_gic_common.c |  2 +-
>  2 files changed, 9 insertions(+), 7 deletions(-)


Adam
-- 
Adam                 adam@os.inf.tu-dresden.de
  Lackorzynski         http://os.inf.tu-dresden.de/~adam/

Re: [Qemu-devel] [PATCH v4 0/4] Improve handling of GICD_ICFGR

[Peter Maydell]

On 18 August 2014 15:30, Adam Lackorzynski <adam@os.inf.tu-dresden.de> wrote:
> The following patches address the behavior of the GICD_ICFGR register
> in the ARM GIC.
>
> Changes to v3:
>  - Tag patchset with proper version
>
> Changes to v2:
>  - Replace 16 with GIC_NR_SGIS in setup
>
> Changes to v1:
>  - Setting of model mode only for old GIC revisions
>  - Less invasive change for PPI settings
>
> Adam Lackorzynski (4):
>   arm_gic: Fix read of GICD_ICFGR
>   arm_gic: GICD_ICFGR: Write model only for pre v1 GICs
>   arm_gic: Do not force PPIs to edge-triggered mode
>   arm_gic: Use GIC_NR_SGIS constant
>
>  hw/intc/arm_gic.c        | 14 ++++++++------
>  hw/intc/arm_gic_common.c |  2 +-
>  2 files changed, 9 insertions(+), 7 deletions(-)

Applied to target-arm.next; thanks.

-- PMM