Skip to contentSkip to conversation

sparc/leon3: Add support for -smp

PATCH Superseded Clément Chigot 4 participants 22 messages Jan 5, 2024 – Jan 9, 2024

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover sparc/leon3: Add support for -smp

This series allows leon3 emulations to record up 4 CPUs.

It requires some enhancements in the grlib_irqmp device and adding the cpu_index field in the asr17 instruction.

It has been tested locally with various bareboard runtimes and through the Gitlab CI: https://gitlab.com/Helflym/qemu/-/pipelines/1127834623.

Clément Chigot (9):
sparc/grlib: split out the headers for each peripherals intc/grlib_irqmp: add ncpus property intc/grlib_irqmp: implements the multiprocessor status register intc/grlib_irqmp: implements multicore irq target/sparc: implement asr17 feature for smp target/sparc: simplify qemu_irq_ack
leon3: implement multiprocessor
leon3: check cpu_id in the tiny bootloader
MAINTAINERS: replace Fabien by myself as Leon3 maintainer

 MAINTAINERS                                   |   2 +-
 hw/char/grlib_apbuart.c                       |   4 +-
 hw/intc/grlib_irqmp.c                         |  97 ++++++++----
 hw/sparc/leon3.c                              | 145 +++++++++++++-----
 hw/timer/grlib_gptimer.c                      |   4 +-
 include/hw/char/grlib_uart.h                  |  30 ++++
 .../hw/{sparc/grlib.h => intc/grlib_irqmp.h}  |  16 +-
 include/hw/timer/grlib_gptimer.h              |  30 ++++
 target/sparc/cpu.h                            |   2 +-
 target/sparc/helper.c                         |  16 ++
 target/sparc/helper.h                         |   1 +
 target/sparc/int32_helper.c                   |   2 +-
 target/sparc/translate.c                      |  13 +-
 13 files changed, 258 insertions(+), 104 deletions(-)
 create mode 100644 include/hw/char/grlib_uart.h
 rename include/hw/{sparc/grlib.h => intc/grlib_irqmp.h} (83%)
 create mode 100644 include/hw/timer/grlib_gptimer.h
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/9 sparc/grlib: split out the headers for each peripherals

... and move them in their right hardware directory.

---
 hw/char/grlib_apbuart.c                       |  4 +--
 hw/intc/grlib_irqmp.c                         |  4 +--
 hw/sparc/leon3.c                              |  6 ++--
 hw/timer/grlib_gptimer.c                      |  4 +--
 include/hw/char/grlib_uart.h                  | 30 +++++++++++++++++++
 .../hw/{sparc/grlib.h => intc/grlib_irqmp.h}  | 14 +++------
 include/hw/timer/grlib_gptimer.h              | 30 +++++++++++++++++++
 7 files changed, 74 insertions(+), 18 deletions(-)
 create mode 100644 include/hw/char/grlib_uart.h
 rename include/hw/{sparc/grlib.h => intc/grlib_irqmp.h} (86%)
 create mode 100644 include/hw/timer/grlib_gptimer.h
hw/char/grlib_apbuart.c +2 -2
index 82ff40a530..2c9ab70b85 100644
@@ -1,7 +1,7 @@
 /*
  * QEMU GRLIB APB UART Emulator
  *
- * Copyright (c) 2010-2019 AdaCore
+ * Copyright (c) 2010-2024 AdaCore
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
-#include "hw/sparc/grlib.h"
+#include "hw/char/grlib_uart.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
hw/intc/grlib_irqmp.c +2 -2
index 3bfe2544b7..c994d5dacc 100644
@@ -3,7 +3,7 @@
  *
  * (Multiprocessor and extended interrupt not supported)
  *
- * Copyright (c) 2010-2019 AdaCore
+ * Copyright (c) 2010-2024 AdaCore
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
 #include "hw/sysbus.h"
 
 #include "hw/qdev-properties.h"
-#include "hw/sparc/grlib.h"
+#include "hw/intc/grlib_irqmp.h"
 
 #include "trace.h"
 #include "qapi/error.h"
hw/sparc/leon3.c +4 -2
index 1e39d2e2d0..58784c099a 100644
@@ -1,7 +1,7 @@
 /*
  * QEMU Leon3 System Emulator
  *
- * Copyright (c) 2010-2019 AdaCore
+ * Copyright (c) 2010-2024 AdaCore
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,9 @@
 #include "elf.h"
 #include "trace.h"
 
-#include "hw/sparc/grlib.h"
+#include "hw/timer/grlib_gptimer.h"
+#include "hw/char/grlib_uart.h"
+#include "hw/intc/grlib_irqmp.h"
 #include "hw/misc/grlib_ahb_apb_pnp.h"
 
 /* Default system clock.  */
hw/timer/grlib_gptimer.c +2 -2
index 5c4923c1e0..5c2cddcec3 100644
@@ -1,7 +1,7 @@
 /*
  * QEMU GRLIB GPTimer Emulator
  *
- * Copyright (c) 2010-2019 AdaCore
+ * Copyright (c) 2010-2024 AdaCore
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sparc/grlib.h"
+#include "hw/timer/grlib_gptimer.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/irq.h"
include/hw/char/grlib_uart.h new file +30 -0
new file mode 100644
index 0000000000..b67da6c62a
@@ -0,0 +1,30 @@
+/*
+ * QEMU GRLIB UART
+ *
+ * Copyright (c) 2024 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef GRLIB_UART_H
+#define GRLIB_UART_H
+
+#define TYPE_GRLIB_APB_UART "grlib-apbuart"
+
+#endif
include/hw/intc/grlib_irqmp.h renamed from include/hw/sparc/grlib.h +4 -10
similarity index 86%
rename from include/hw/sparc/grlib.h
rename to include/hw/intc/grlib_irqmp.h
index ef1946c7f8..b9cc584168 100644
@@ -1,7 +1,7 @@
 /*
  * QEMU GRLIB Components
  *
- * Copyright (c) 2010-2019 AdaCore
+ * Copyright (c) 2010-2024 AdaCore
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef GRLIB_H
-#define GRLIB_H
+#ifndef GRLIB_IRQMP_H
+#define GRLIB_IRQMP_H
 
 #include "hw/sysbus.h"
 
@@ -36,10 +36,4 @@
 
 void grlib_irqmp_ack(DeviceState *dev, int intno);
 
-/* GPTimer */
-#define TYPE_GRLIB_GPTIMER "grlib-gptimer"
-
-/* APB UART */
-#define TYPE_GRLIB_APB_UART "grlib-apbuart"
-
-#endif /* GRLIB_H */
+#endif /* GRLIB_IRQMP_H */
include/hw/timer/grlib_gptimer.h new file +30 -0
new file mode 100644
index 0000000000..81b1ff0511
@@ -0,0 +1,30 @@
+/*
+ * QEMU GRLIB GPTimer
+ *
+ * Copyright (c) 2024 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef GRLIB_GPTIMER_H
+#define GRLIB_GPTIMER_H
+
+#define TYPE_GRLIB_GPTIMER "grlib-gptimer"
+
+#endif
Signature · 1 line
2.25.1
Reviewed-by on v1 1/9
#2 lore raw

Re: [PATCH 1/9] sparc/grlib: split out the headers for each peripherals

Quoted 13 lines · Clément Chigot

... and move them in their right hardware directory.

---
  hw/char/grlib_apbuart.c                       |  4 +--
  hw/intc/grlib_irqmp.c                         |  4 +--
  hw/sparc/leon3.c                              |  6 ++--
  hw/timer/grlib_gptimer.c                      |  4 +--
  include/hw/char/grlib_uart.h                  | 30 +++++++++++++++++++
  .../hw/{sparc/grlib.h => intc/grlib_irqmp.h}  | 14 +++------
  include/hw/timer/grlib_gptimer.h              | 30 +++++++++++++++++++
  7 files changed, 74 insertions(+), 18 deletions(-)
Quoted 3 lines

create mode 100644 include/hw/char/grlib_uart.h rename include/hw/{sparc/grlib.h => intc/grlib_irqmp.h} (86%) create mode 100644 include/hw/timer/grlib_gptimer.h

This still matches the MAINTAINERS patterns, good.

Quoted 18 lines
include/hw/char/grlib_uart.h new file +12 -0
new file mode 100644
index 0000000000..b67da6c62a
@@ -0,0 +1,30 @@
+/*
+ * QEMU GRLIB UART
+ *
+ * Copyright (c) 2024 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *

include/hw/char/grlib_uart.h line 22

Quoted 10 lines
include/hw/char/grlib_uart.h new file +10 -0
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.

When adding license, SPDX tag is prefered (although not enforced) because it eases tools parsing.

include/hw/char/grlib_uart.h line 30

Quoted 8 lines
include/hw/char/grlib_uart.h new file +8 -0
+ */
+
+#ifndef GRLIB_UART_H
+#define GRLIB_UART_H
+
+#define TYPE_GRLIB_APB_UART "grlib-apbuart"
+
+#endif
#3 lore raw

Re: [PATCH 1/9] sparc/grlib: split out the headers for each peripherals

Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 13 lines · Clément Chigot

... and move them in their right hardware directory.

---
  hw/char/grlib_apbuart.c                       |  4 +--
  hw/intc/grlib_irqmp.c                         |  4 +--
  hw/sparc/leon3.c                              |  6 ++--
  hw/timer/grlib_gptimer.c                      |  4 +--
  include/hw/char/grlib_uart.h                  | 30 +++++++++++++++++++
  .../hw/{sparc/grlib.h => intc/grlib_irqmp.h}  | 14 +++------
  include/hw/timer/grlib_gptimer.h              | 30 +++++++++++++++++++
  7 files changed, 74 insertions(+), 18 deletions(-)
Quoted 3 lines

create mode 100644 include/hw/char/grlib_uart.h rename include/hw/{sparc/grlib.h => intc/grlib_irqmp.h} (86%) create mode 100644 include/hw/timer/grlib_gptimer.h

This still matches the MAINTAINERS patterns, good.

Quoted 23 lines
include/hw/char/grlib_uart.h new file +17 -0
new file mode 100644
index 0000000000..b67da6c62a
@@ -0,0 +1,30 @@
+/*
+ * QEMU GRLIB UART
+ *
+ * Copyright (c) 2024 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Quoted 8 lines

include/hw/char/grlib_uart.h line 22

Quoted 5 lines
include/hw/char/grlib_uart.h new file +5 -0
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.

When adding license, SPDX tag is prefered (although not enforced) because it eases tools parsing.

Should it be something like this ?
* SPDX-FileCopyrightText: 20xx-2024 Adacore
* SPDX-License-Identifier: MIT

Would updating, now, all those files make it better ?

Quoted 11 lines

include/hw/char/grlib_uart.h line 30

Quoted 8 lines
include/hw/char/grlib_uart.h new file +8 -0
+ */
+
+#ifndef GRLIB_UART_H
+#define GRLIB_UART_H
+
+#define TYPE_GRLIB_APB_UART "grlib-apbuart"
+
+#endif
#4 lore raw

PATCH 2/9 intc/grlib_irqmp: add ncpus property

In reply to Clément Chigot

This adds a "ncpus" property to the "grlib-irqmp" device to be used later, this required a little refactoring of how we initialize the device (ie: use realize instead of init).

---
 hw/intc/grlib_irqmp.c | 30 +++++++++++++++++++++---------
 hw/sparc/leon3.c      |  2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)
hw/intc/grlib_irqmp.c +21 -9
index c994d5dacc..2bacc0ff56 100644
@@ -1,7 +1,7 @@
 /*
  * QEMU GRLIB IRQMP Emulator
  *
- * (Multiprocessor and extended interrupt not supported)
+ * (Extended interrupt not supported)
  *
  * Copyright (c) 2010-2024 AdaCore
  *
@@ -61,6 +61,7 @@ struct IRQMP {
 
     MemoryRegion iomem;
 
+    unsigned int ncpus;
     IRQMPState *state;
     qemu_irq irq;
 };
@@ -324,33 +325,44 @@ static void grlib_irqmp_reset(DeviceState *d)
     irqmp->state->parent = irqmp;
 }
 
-static void grlib_irqmp_init(Object *obj)
+static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
 {
-    IRQMP *irqmp = GRLIB_IRQMP(obj);
-    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+    IRQMP *irqmp = GRLIB_IRQMP(dev);
 
-    qdev_init_gpio_in(DEVICE(obj), grlib_irqmp_set_irq, MAX_PILS);
-    qdev_init_gpio_out_named(DEVICE(obj), &irqmp->irq, "grlib-irq", 1);
-    memory_region_init_io(&irqmp->iomem, obj, &grlib_irqmp_ops, irqmp,
+    if ((!irqmp->ncpus) || (irqmp->ncpus > IRQMP_MAX_CPU)) {
+        error_setg(errp, "Invalid ncpus properties: "
+                   "%u, must be 0 < ncpus =< %u.", irqmp->ncpus,
+                   IRQMP_MAX_CPU);
+    }
+
+    qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS);
+    qdev_init_gpio_out_named(dev, &irqmp->irq, "grlib-irq", 1);
+    memory_region_init_io(&irqmp->iomem, OBJECT(dev), &grlib_irqmp_ops, irqmp,
                           "irqmp", IRQMP_REG_SIZE);
 
     irqmp->state = g_malloc0(sizeof *irqmp->state);
 
-    sysbus_init_mmio(dev, &irqmp->iomem);
+    sysbus_init_mmio(SYS_BUS_DEVICE(dev), &irqmp->iomem);
 }
 
+static Property grlib_irqmp_properties[] = {
+    DEFINE_PROP_UINT32("ncpus", IRQMP, ncpus, 1),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void grlib_irqmp_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
 
+    dc->realize = grlib_irqmp_realize;
     dc->reset = grlib_irqmp_reset;
+    device_class_set_props(dc, grlib_irqmp_properties);
 }
 
 static const TypeInfo grlib_irqmp_info = {
     .name          = TYPE_GRLIB_IRQMP,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(IRQMP),
-    .instance_init = grlib_irqmp_init,
     .class_init    = grlib_irqmp_class_init,
 };
 
hw/sparc/leon3.c +1 -1
index 58784c099a..7b9809b81f 100644
@@ -263,11 +263,11 @@ static void leon3_generic_hw_init(MachineState *machine)
 
     /* Allocate IRQ manager */
     irqmpdev = qdev_new(TYPE_GRLIB_IRQMP);
+    sysbus_realize_and_unref(SYS_BUS_DEVICE(irqmpdev), &error_fatal);
     qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_set_pil_in,
                                         env, "pil", 1);
     qdev_connect_gpio_out_named(irqmpdev, "grlib-irq", 0,
                                 qdev_get_gpio_in_named(DEVICE(cpu), "pil", 0));
-    sysbus_realize_and_unref(SYS_BUS_DEVICE(irqmpdev), &error_fatal);
     sysbus_mmio_map(SYS_BUS_DEVICE(irqmpdev), 0, LEON3_IRQMP_OFFSET);
     env->irq_manager = irqmpdev;
     env->qemu_irq_ack = leon3_irq_manager;
Signature · 1 line
2.25.1
Reviewed-by on v1 2/9
#5 lore raw

Re: [PATCH 2/9] intc/grlib_irqmp: add ncpus property

Quoted 10 lines · Clément Chigot

This adds a "ncpus" property to the "grlib-irqmp" device to be used later, this required a little refactoring of how we initialize the device (ie: use realize instead of init).

---
  hw/intc/grlib_irqmp.c | 30 +++++++++++++++++++++---------
  hw/sparc/leon3.c      |  2 +-
  2 files changed, 22 insertions(+), 10 deletions(-)
#6 lore raw

PATCH 3/9 intc/grlib_irqmp: implements the multiprocessor status register

In reply to Clément Chigot

This implements the multiprocessor status register in grlib-irqmp and bind it to a start signal, which will be later wired in leon3-generic to start a cpu.

---
 hw/intc/grlib_irqmp.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
hw/intc/grlib_irqmp.c +19 -3
index 2bacc0ff56..be0e840181 100644
@@ -63,6 +63,7 @@ struct IRQMP {
 
     unsigned int ncpus;
     IRQMPState *state;
+    qemu_irq start_signal[IRQMP_MAX_CPU];
     qemu_irq irq;
 };
 
@@ -70,6 +71,7 @@ struct IRQMPState {
     uint32_t level;
     uint32_t pending;
     uint32_t clear;
+    uint32_t mpstatus;
     uint32_t broadcast;
 
     uint32_t mask[IRQMP_MAX_CPU];
@@ -180,10 +182,12 @@ static uint64_t grlib_irqmp_read(void *opaque, hwaddr addr,
         return state->force[0];
 
     case CLEAR_OFFSET:
-    case MP_STATUS_OFFSET:
         /* Always read as 0 */
         return 0;
 
+    case MP_STATUS_OFFSET:
+        return state->mpstatus;
+
     case BROADCAST_OFFSET:
         return state->broadcast;
 
@@ -222,8 +226,9 @@ static uint64_t grlib_irqmp_read(void *opaque, hwaddr addr,
 static void grlib_irqmp_write(void *opaque, hwaddr addr,
                               uint64_t value, unsigned size)
 {
-    IRQMP      *irqmp = opaque;
+    IRQMP *irqmp = opaque;
     IRQMPState *state;
+    int i;
 
     assert(irqmp != NULL);
     state = irqmp->state;
@@ -256,7 +261,13 @@ static void grlib_irqmp_write(void *opaque, hwaddr addr,
         return;
 
     case MP_STATUS_OFFSET:
-        /* Read Only (no SMP support) */
+        value &= 0xffff;
+        for (i = 0; i < irqmp->ncpus; i++) {
+            if ((value >> i) & 1) {
+                qemu_set_irq(irqmp->start_signal[i], 1);
+                state->mpstatus &= ~(1 << i);
+            }
+        }
         return;
 
     case BROADCAST_OFFSET:
@@ -323,6 +334,8 @@ static void grlib_irqmp_reset(DeviceState *d)
 
     memset(irqmp->state, 0, sizeof *irqmp->state);
     irqmp->state->parent = irqmp;
+    irqmp->state->mpstatus = ((irqmp->ncpus - 1) << 28)
+        | ((1 << irqmp->ncpus) - 2);
 }
 
 static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
@@ -336,6 +349,9 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
     }
 
     qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS);
+    /* Transitionning from 0 to 1 starts the CPUs.  */
+    qdev_init_gpio_out_named(dev, irqmp->start_signal, "grlib-start-cpu",
+                             IRQMP_MAX_CPU);
     qdev_init_gpio_out_named(dev, &irqmp->irq, "grlib-irq", 1);
     memory_region_init_io(&irqmp->iomem, OBJECT(dev), &grlib_irqmp_ops, irqmp,
                           "irqmp", IRQMP_REG_SIZE);
Signature · 1 line
2.25.1
#7 lore raw

Re: [PATCH 3/9] intc/grlib_irqmp: implements the multiprocessor status register

Hi Clément,

Quoted 12 lines · Clément Chigot

This implements the multiprocessor status register in grlib-irqmp and bind it to a start signal, which will be later wired in leon3-generic to start a cpu.

---
  hw/intc/grlib_irqmp.c | 22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)

hw/intc/grlib_irqmp.c static void grlib_irqmp_reset(DeviceState *d) · line 337

Quoted 4 lines
hw/intc/grlib_irqmp.c +1 -0
@@ -323,6 +334,8 @@ static void grlib_irqmp_reset(DeviceState *d)
 
      memset(irqmp->state, 0, sizeof *irqmp->state);
      irqmp->state->parent = irqmp;
+    irqmp->state->mpstatus = ((irqmp->ncpus - 1) << 28)

Can you #define this magic '28' number?

hw/intc/grlib_irqmp.c static void grlib_irqmp_realize(DeviceState *dev, Error **errp) · line 352

Quoted 9 lines
hw/intc/grlib_irqmp.c +2 -0
+        | ((1 << irqmp->ncpus) - 2);
  }
 
  static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
@@ -336,6 +349,9 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
      }
 
      qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS);
+    /* Transitionning from 0 to 1 starts the CPUs.  */

What about 1 -> 0?

Quoted 5 lines
hw/intc/grlib_irqmp.c +2 -0
+    qdev_init_gpio_out_named(dev, irqmp->start_signal, "grlib-start-cpu",
+                             IRQMP_MAX_CPU);
      qdev_init_gpio_out_named(dev, &irqmp->irq, "grlib-irq", 1);
      memory_region_init_io(&irqmp->iomem, OBJECT(dev), &grlib_irqmp_ops, irqmp,
                            "irqmp", IRQMP_REG_SIZE);
#8 lore raw

Re: [PATCH 3/9] intc/grlib_irqmp: implements the multiprocessor status register

Quoted 26 lines · Philippe Mathieu-Daudé

Hi Clément,

Quoted 12 lines · Clément Chigot

This implements the multiprocessor status register in grlib-irqmp and bind it to a start signal, which will be later wired in leon3-generic to start a cpu.

---
  hw/intc/grlib_irqmp.c | 22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)

hw/intc/grlib_irqmp.c static void grlib_irqmp_reset(DeviceState *d) · line 337

Quoted 4 lines
hw/intc/grlib_irqmp.c +1 -0
@@ -323,6 +334,8 @@ static void grlib_irqmp_reset(DeviceState *d)
 
      memset(irqmp->state, 0, sizeof *irqmp->state);
      irqmp->state->parent = irqmp;
+    irqmp->state->mpstatus = ((irqmp->ncpus - 1) << 28)

Can you #define this magic '28' number?

Quoted 3 lines
hw/intc/grlib_irqmp.c +1 -0
+        | ((1 << irqmp->ncpus) - 2);
  }
 
Quoted 8 lines

hw/intc/grlib_irqmp.c static void grlib_irqmp_realize(DeviceState *dev, Error **errp) · line 352

Quoted 6 lines
hw/intc/grlib_irqmp.c +1 -0
  static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
@@ -336,6 +349,9 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
      }
 
      qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS);
+    /* Transitionning from 0 to 1 starts the CPUs.  */

What about 1 -> 0?

It does nothing. I have updated the comment to mention it.
For the doc (also mention it in the commit message now).
| [15:1] Power-down status of CPU [n]: reads ‘1’ = power-down, ‘0’ = running. | Write to start processor n: ‘1’=to start ‘0'=has no effect.

Quoted 6 lines
Quoted 5 lines
hw/intc/grlib_irqmp.c +2 -0
+    qdev_init_gpio_out_named(dev, irqmp->start_signal, "grlib-start-cpu",
+                             IRQMP_MAX_CPU);
      qdev_init_gpio_out_named(dev, &irqmp->irq, "grlib-irq", 1);
      memory_region_init_io(&irqmp->iomem, OBJECT(dev), &grlib_irqmp_ops, irqmp,
                            "irqmp", IRQMP_REG_SIZE);
#9 lore raw

Re: [PATCH 3/9] intc/grlib_irqmp: implements the multiprocessor status register

Quoted 37 lines · Clément Chigot
Quoted 26 lines · Philippe Mathieu-Daudé

Hi Clément,

Quoted 12 lines · Clément Chigot

This implements the multiprocessor status register in grlib-irqmp and bind it to a start signal, which will be later wired in leon3-generic to start a cpu.

---
   hw/intc/grlib_irqmp.c | 22 +++++++++++++++++++---
   1 file changed, 19 insertions(+), 3 deletions(-)

hw/intc/grlib_irqmp.c static void grlib_irqmp_reset(DeviceState *d) · line 337

Quoted 4 lines
hw/intc/grlib_irqmp.c +1 -0
@@ -323,6 +334,8 @@ static void grlib_irqmp_reset(DeviceState *d)
 
       memset(irqmp->state, 0, sizeof *irqmp->state);
       irqmp->state->parent = irqmp;
+    irqmp->state->mpstatus = ((irqmp->ncpus - 1) << 28)

Can you #define this magic '28' number?

Quoted 3 lines
hw/intc/grlib_irqmp.c +1 -0
+        | ((1 << irqmp->ncpus) - 2);
   }
 
Quoted 8 lines

hw/intc/grlib_irqmp.c static void grlib_irqmp_realize(DeviceState *dev, Error **errp) · line 352

Quoted 6 lines
hw/intc/grlib_irqmp.c +1 -0
   static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
@@ -336,6 +349,9 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
       }
 
       qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS);
+    /* Transitionning from 0 to 1 starts the CPUs.  */

What about 1 -> 0?

Quoted 4 lines

It does nothing. I have updated the comment to mention it.
For the doc (also mention it in the commit message now).
| [15:1] Power-down status of CPU [n]: reads ‘1’ = power-down, ‘0’ = running. | Write to start processor n: ‘1’=to start ‘0'=has no effect.

Then grlib_irqmp_write() could be simplified as:

case MP_STATUS_OFFSET:
- /* Read Only (no SMP support) */
+ state->mpstatus = deposit32(state->mpstatus,
+ value, 0, IRQMP_MAX_CPU);
+ for (unsigned i = 0; i < irqmp->ncpus; i++) {
+ qemu_set_irq(irqmp->start_signal[i],
+ extract32(value, i, 1));
+ }

         return;
#10 lore raw

Re: [PATCH 3/9] intc/grlib_irqmp: implements the multiprocessor status register

Quoted 47 lines · Philippe Mathieu-Daudé
Quoted 37 lines · Clément Chigot
Quoted 26 lines · Philippe Mathieu-Daudé

Hi Clément,

Quoted 12 lines · Clément Chigot

This implements the multiprocessor status register in grlib-irqmp and bind it to a start signal, which will be later wired in leon3-generic to start a cpu.

---
   hw/intc/grlib_irqmp.c | 22 +++++++++++++++++++---
   1 file changed, 19 insertions(+), 3 deletions(-)

hw/intc/grlib_irqmp.c static void grlib_irqmp_reset(DeviceState *d) · line 337

Quoted 4 lines
hw/intc/grlib_irqmp.c +1 -0
@@ -323,6 +334,8 @@ static void grlib_irqmp_reset(DeviceState *d)
 
       memset(irqmp->state, 0, sizeof *irqmp->state);
       irqmp->state->parent = irqmp;
+    irqmp->state->mpstatus = ((irqmp->ncpus - 1) << 28)

Can you #define this magic '28' number?

Quoted 3 lines
hw/intc/grlib_irqmp.c +1 -0
+        | ((1 << irqmp->ncpus) - 2);
   }
 
Quoted 8 lines

hw/intc/grlib_irqmp.c static void grlib_irqmp_realize(DeviceState *dev, Error **errp) · line 352

Quoted 6 lines
hw/intc/grlib_irqmp.c +1 -0
   static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
@@ -336,6 +349,9 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
       }
 
       qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS);
+    /* Transitionning from 0 to 1 starts the CPUs.  */

What about 1 -> 0?

Quoted 4 lines

It does nothing. I have updated the comment to mention it.
For the doc (also mention it in the commit message now).
| [15:1] Power-down status of CPU [n]: reads ‘1’ = power-down, ‘0’ = running. | Write to start processor n: ‘1’=to start ‘0'=has no effect.

Then grlib_irqmp_write() could be simplified as:

case MP_STATUS_OFFSET:

Review

Quoted 8 lines
(quoted diff) +6 -1
-        /* Read Only (no SMP support) */
+        state->mpstatus = deposit32(state->mpstatus,
+                                    value, 0, IRQMP_MAX_CPU);
+        for (unsigned i = 0; i < irqmp->ncpus; i++) {
+            qemu_set_irq(irqmp->start_signal[i],
+                         extract32(value, i, 1));
+        }
          return;

No, because the logic between write and read is reversed. Writing "1" starts the CPU but reading 1 means that the CPU is not started. Therefore, when writing 1, we must trigger the start signal and then write 0 in mpstatus.

#11 lore raw

PATCH 4/9 intc/grlib_irqmp: implements multicore irq

In reply to Clément Chigot

Now there is an ncpus property, use it in order to deliver the IRQ to multiple CPU.

---
 hw/intc/grlib_irqmp.c         | 43 ++++++++++++++++++-----------------
 hw/sparc/leon3.c              |  3 ++-
 include/hw/intc/grlib_irqmp.h |  2 +-
 3 files changed, 25 insertions(+), 23 deletions(-)
hw/intc/grlib_irqmp.c +22 -21
index be0e840181..4df0293064 100644
@@ -64,7 +64,7 @@ struct IRQMP {
     unsigned int ncpus;
     IRQMPState *state;
     qemu_irq start_signal[IRQMP_MAX_CPU];
-    qemu_irq irq;
+    qemu_irq irq[IRQMP_MAX_CPU];
 };
 
 struct IRQMPState {
@@ -83,37 +83,37 @@ struct IRQMPState {
 
 static void grlib_irqmp_check_irqs(IRQMPState *state)
 {
-    uint32_t      pend   = 0;
-    uint32_t      level0 = 0;
-    uint32_t      level1 = 0;
+    uint32_t pend = 0;
+    uint32_t level0 = 0;
+    uint32_t level1 = 0;
+    int i;
 
     assert(state != NULL);
     assert(state->parent != NULL);
 
-    /* IRQ for CPU 0 (no SMP support) */
-    pend = (state->pending | state->force[0])
-        & state->mask[0];
-
-    level0 = pend & ~state->level;
-    level1 = pend &  state->level;
+    for (i = 0; i < state->parent->ncpus; i++) {
+        pend = (state->pending | state->force[i]) & state->mask[i];
+        level0 = pend & ~state->level;
+        level1 = pend &  state->level;
 
-    trace_grlib_irqmp_check_irqs(state->pending, state->force[0],
-                                 state->mask[0], level1, level0);
+        trace_grlib_irqmp_check_irqs(state->pending, state->force[i],
+                                     state->mask[i], level1, level0);
 
-    /* Trigger level1 interrupt first and level0 if there is no level1 */
-    qemu_set_irq(state->parent->irq, level1 ?: level0);
+        /* Trigger level1 interrupt first and level0 if there is no level1 */
+        qemu_set_irq(state->parent->irq[i], level1 ?: level0);
+    }
 }
 
-static void grlib_irqmp_ack_mask(IRQMPState *state, uint32_t mask)
+static void grlib_irqmp_ack_mask(IRQMPState *state, int cpu, uint32_t mask)
 {
     /* Clear registers */
     state->pending  &= ~mask;
-    state->force[0] &= ~mask; /* Only CPU 0 (No SMP support) */
+    state->force[cpu] &= ~mask;
 
     grlib_irqmp_check_irqs(state);
 }
 
-void grlib_irqmp_ack(DeviceState *dev, int intno)
+void grlib_irqmp_ack(DeviceState *dev, int cpu, int intno)
 {
     IRQMP        *irqmp = GRLIB_IRQMP(dev);
     IRQMPState   *state;
@@ -127,7 +127,7 @@ void grlib_irqmp_ack(DeviceState *dev, int intno)
 
     trace_grlib_irqmp_ack(intno);
 
-    grlib_irqmp_ack_mask(state, mask);
+    grlib_irqmp_ack_mask(state, cpu, mask);
 }
 
 static void grlib_irqmp_set_irq(void *opaque, int irq, int level)
@@ -153,7 +153,6 @@ static void grlib_irqmp_set_irq(void *opaque, int irq, int level)
             s->pending |= 1 << irq;
         }
         grlib_irqmp_check_irqs(s);
-
     }
 }
 
@@ -257,7 +256,9 @@ static void grlib_irqmp_write(void *opaque, hwaddr addr,
 
     case CLEAR_OFFSET:
         value &= ~1; /* clean up the value */
-        grlib_irqmp_ack_mask(state, value);
+        for (i = 0; i < irqmp->ncpus; i++) {
+            grlib_irqmp_ack_mask(state, i, value);
+        }
         return;
 
     case MP_STATUS_OFFSET:
@@ -352,7 +353,7 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
     /* Transitionning from 0 to 1 starts the CPUs.  */
     qdev_init_gpio_out_named(dev, irqmp->start_signal, "grlib-start-cpu",
                              IRQMP_MAX_CPU);
-    qdev_init_gpio_out_named(dev, &irqmp->irq, "grlib-irq", 1);
+    qdev_init_gpio_out_named(dev, irqmp->irq, "grlib-irq", irqmp->ncpus);
     memory_region_init_io(&irqmp->iomem, OBJECT(dev), &grlib_irqmp_ops, irqmp,
                           "irqmp", IRQMP_REG_SIZE);
 
hw/sparc/leon3.c +2 -1
index 7b9809b81f..94d8ec94b0 100644
@@ -168,7 +168,8 @@ static void leon3_cache_control_int(CPUSPARCState *env)
 
 static void leon3_irq_ack(void *irq_manager, int intno)
 {
-    grlib_irqmp_ack((DeviceState *)irq_manager, intno);
+    /* No SMP support yet.  */
+    grlib_irqmp_ack((DeviceState *)irq_manager, 0, intno);
 }
 
 /*
include/hw/intc/grlib_irqmp.h +1 -1
index b9cc584168..776a2508e1 100644
@@ -34,6 +34,6 @@
 /* IRQMP */
 #define TYPE_GRLIB_IRQMP "grlib-irqmp"
 
-void grlib_irqmp_ack(DeviceState *dev, int intno);
+void grlib_irqmp_ack(DeviceState *dev, int cpu, int intno);
 
 #endif /* GRLIB_IRQMP_H */
Signature · 1 line
2.25.1
#12 lore raw

Re: [PATCH 4/9] intc/grlib_irqmp: implements multicore irq

Quoted 17 lines · Clément Chigot

Now there is an ncpus property, use it in order to deliver the IRQ to multiple CPU.

---
  hw/intc/grlib_irqmp.c         | 43 ++++++++++++++++++-----------------
  hw/sparc/leon3.c              |  3 ++-
  include/hw/intc/grlib_irqmp.h |  2 +-
  3 files changed, 25 insertions(+), 23 deletions(-)
hw/sparc/leon3.c +0 -0
index 7b9809b81f..94d8ec94b0 100644

hw/sparc/leon3.c static void leon3_cache_control_int(CPUSPARCState *env) · line 172

Quoted 6 lines
hw/sparc/leon3.c +2 -1
@@ -168,7 +168,8 @@ static void leon3_cache_control_int(CPUSPARCState *env)
 
  static void leon3_irq_ack(void *irq_manager, int intno)
  {
-    grlib_irqmp_ack((DeviceState *)irq_manager, intno);
+    /* No SMP support yet.  */
+    grlib_irqmp_ack((DeviceState *)irq_manager, 0, intno);

This '0' was not obvious, now I figured, I suggest:

      /* No SMP support yet, only CPU #0 available so far. */
Quoted 1 line
hw/sparc/leon3.c +0 -0
  }
#13 lore raw

PATCH 5/9 target/sparc: implement asr17 feature for smp

In reply to Clément Chigot

This allows the guest program to know its cpu id.

---
 target/sparc/helper.c    | 16 ++++++++++++++++
 target/sparc/helper.h    |  1 +
 target/sparc/translate.c | 13 +++----------
 3 files changed, 20 insertions(+), 10 deletions(-)
target/sparc/helper.c +16 -0
index bd10b60e4b..2247e243b5 100644
@@ -212,4 +212,20 @@ void helper_power_down(CPUSPARCState *env)
     env->npc = env->pc + 4;
     cpu_loop_exit(cs);
 }
+
+target_ulong helper_rdasr17(CPUSPARCState *env)
+{
+    CPUState *cs = env_cpu(env);
+    target_ulong val;
+
+    /*
+     * TODO: There are many more fields to be filled,
+     * some of which are writable.
+     */
+    val = env->def.nwindows - 1;    /* [4:0]   NWIN   */
+    val |= 1 << 8;                  /* [8]      V8    */
+    val |= (cs->cpu_index) << 28;   /* [31:28] INDEX  */
+
+    return val;
+}
 #endif
target/sparc/helper.h +1 -0
index 55eff66283..fc818b8678 100644
@@ -2,6 +2,7 @@
 DEF_HELPER_1(rett, void, env)
 DEF_HELPER_2(wrpsr, void, env, tl)
 DEF_HELPER_1(rdpsr, tl, env)
+DEF_HELPER_1(rdasr17, tl, env)
 DEF_HELPER_1(power_down, void, env)
 #else
 DEF_HELPER_FLAGS_2(wrpil, TCG_CALL_NO_RWG, void, env, tl)
target/sparc/translate.c +3 -10
index 9387299559..1cabda9565 100644
@@ -37,6 +37,7 @@
 
 #ifdef TARGET_SPARC64
 # define gen_helper_rdpsr(D, E)                 qemu_build_not_reached()
+# define gen_helper_rdasr17(D, E)               qemu_build_not_reached()
 # define gen_helper_rett(E)                     qemu_build_not_reached()
 # define gen_helper_power_down(E)               qemu_build_not_reached()
 # define gen_helper_wrpsr(E, S)                 qemu_build_not_reached()
@@ -2681,16 +2682,8 @@ static bool trans_RDY(DisasContext *dc, arg_RDY *a)
 
 static TCGv do_rd_leon3_config(DisasContext *dc, TCGv dst)
 {
-    uint32_t val;
-
-    /*
-     * TODO: There are many more fields to be filled,
-     * some of which are writable.
-     */
-    val = dc->def->nwindows - 1;   /* [4:0] NWIN */
-    val |= 1 << 8;                 /* [8]   V8   */
-
-    return tcg_constant_tl(val);
+    gen_helper_rdasr17(dst, tcg_env);
+    return dst;
 }
 
 TRANS(RDASR17, ASR17, do_rd_special, true, a->rd, do_rd_leon3_config)
Signature · 1 line
2.25.1
Reviewed-by on v1 5/9
#14 lore raw

Re: [PATCH 5/9] target/sparc: implement asr17 feature for smp

Quoted 9 lines · Clément Chigot

This allows the guest program to know its cpu id.

---
  target/sparc/helper.c    | 16 ++++++++++++++++
  target/sparc/helper.h    |  1 +
  target/sparc/translate.c | 13 +++----------
  3 files changed, 20 insertions(+), 10 deletions(-)

r~

#15 lore raw

PATCH 6/9 target/sparc: simplify qemu_irq_ack

In reply to Clément Chigot

This is a simple cleanup, since env is passed to qemu_irq_ack it can be accessed from inside qemu_irq_ack. Just drop this parameter.

---
 hw/sparc/leon3.c            | 8 ++++----
 target/sparc/cpu.h          | 2 +-
 target/sparc/int32_helper.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
hw/sparc/leon3.c +4 -4
index 94d8ec94b0..6019fc4c2d 100644
@@ -166,10 +166,10 @@ static void leon3_cache_control_int(CPUSPARCState *env)
     }
 }
 
-static void leon3_irq_ack(void *irq_manager, int intno)
+static void leon3_irq_ack(CPUSPARCState *env, int intno)
 {
     /* No SMP support yet.  */
-    grlib_irqmp_ack((DeviceState *)irq_manager, 0, intno);
+    grlib_irqmp_ack(env->irq_manager, 0, intno);
 }
 
 /*
@@ -211,9 +211,9 @@ static void leon3_set_pil_in(void *opaque, int n, int level)
     }
 }
 
-static void leon3_irq_manager(CPUSPARCState *env, void *irq_manager, int intno)
+static void leon3_irq_manager(CPUSPARCState *env, int intno)
 {
-    leon3_irq_ack(irq_manager, intno);
+    leon3_irq_ack(env, intno);
     leon3_cache_control_int(env);
 }
 
target/sparc/cpu.h +1 -1
index 6999a10a40..12a11ecb26 100644
@@ -549,7 +549,7 @@ struct CPUArchState {
     sparc_def_t def;
 
     void *irq_manager;
-    void (*qemu_irq_ack)(CPUSPARCState *env, void *irq_manager, int intno);
+    void (*qemu_irq_ack)(CPUSPARCState *env, int intno);
 
     /* Leon3 cache control */
     uint32_t cache_control;
target/sparc/int32_helper.c +1 -1
index 1563613582..8f4e08ed09 100644
@@ -160,7 +160,7 @@ void sparc_cpu_do_interrupt(CPUState *cs)
 #if !defined(CONFIG_USER_ONLY)
     /* IRQ acknowledgment */
     if ((intno & ~15) == TT_EXTINT && env->qemu_irq_ack != NULL) {
-        env->qemu_irq_ack(env, env->irq_manager, intno);
+        env->qemu_irq_ack(env, intno);
     }
 #endif
 }
Signature · 1 line
2.25.1
Reviewed-by on v1 6/9
#16 lore raw

Re: [PATCH 6/9] target/sparc: simplify qemu_irq_ack

Quoted 10 lines · Clément Chigot

This is a simple cleanup, since env is passed to qemu_irq_ack it can be accessed from inside qemu_irq_ack. Just drop this parameter.

---
  hw/sparc/leon3.c            | 8 ++++----
  target/sparc/cpu.h          | 2 +-
  target/sparc/int32_helper.c | 2 +-
  3 files changed, 6 insertions(+), 6 deletions(-)
#17 lore raw

PATCH 7/9 leon3: implement multiprocessor

In reply to Clément Chigot

This allows to register more than one CPU on the leon3_generic machine.

---
 hw/sparc/leon3.c | 106 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 74 insertions(+), 32 deletions(-)
hw/sparc/leon3.c +74 -32
index 6019fc4c2d..38fb8d9af1 100644
@@ -52,6 +52,8 @@
 #define LEON3_PROM_OFFSET    (0x00000000)
 #define LEON3_RAM_OFFSET     (0x40000000)
 
+#define MAX_CPUS  4
+
 #define LEON3_UART_OFFSET  (0x80000100)
 #define LEON3_UART_IRQ     (3)
 
@@ -65,9 +67,12 @@
 #define LEON3_AHB_PNP_OFFSET (0xFFFFF000)
 
 typedef struct ResetData {
-    SPARCCPU *cpu;
-    uint32_t  entry;            /* save kernel entry in case of reset */
-    target_ulong sp;            /* initial stack pointer */
+    struct CPUResetData {
+        int id;
+        SPARCCPU *cpu;
+        target_ulong sp;  /* initial stack pointer */
+    } info[MAX_CPUS];
+    uint32_t entry;             /* save kernel entry in case of reset */
 } ResetData;
 
 static uint32_t *gen_store_u32(uint32_t *code, hwaddr addr, uint32_t val)
@@ -123,18 +128,19 @@ static void write_bootloader(CPUSPARCState *env, uint8_t *base,
     stl_p(p++, 0x01000000); /* nop */
 }
 
-static void main_cpu_reset(void *opaque)
+static void leon3_cpu_reset(void *opaque)
 {
-    ResetData *s   = (ResetData *)opaque;
-    CPUState *cpu = CPU(s->cpu);
-    CPUSPARCState  *env = &s->cpu->env;
+    struct CPUResetData *info = (struct CPUResetData *) opaque;
+    int id = info->id;
+    ResetData *s = (ResetData *)DO_UPCAST(ResetData, info[id], info);
+    CPUState *cpu = CPU(s->info[id].cpu);
+    CPUSPARCState *env = cpu_env(cpu);
 
     cpu_reset(cpu);
-
-    cpu->halted = 0;
-    env->pc     = s->entry;
-    env->npc    = s->entry + 4;
-    env->regbase[6] = s->sp;
+    cpu->halted = cpu->cpu_index != 0;
+    env->pc = s->entry;
+    env->npc = s->entry + 4;
+    env->regbase[6] = s->info[id].sp;
 }
 
 static void leon3_cache_control_int(CPUSPARCState *env)
@@ -168,8 +174,8 @@ static void leon3_cache_control_int(CPUSPARCState *env)
 
 static void leon3_irq_ack(CPUSPARCState *env, int intno)
 {
-    /* No SMP support yet.  */
-    grlib_irqmp_ack(env->irq_manager, 0, intno);
+    CPUState *cpu = CPU(env_cpu(env));
+    grlib_irqmp_ack(env->irq_manager, cpu->cpu_index, intno);
 }
 
 /*
@@ -211,6 +217,20 @@ static void leon3_set_pil_in(void *opaque, int n, int level)
     }
 }
 
+static void leon3_start_cpu_async_work(CPUState *cpu, run_on_cpu_data data)
+{
+    cpu->halted = 0;
+}
+
+static void leon3_start_cpu(void *opaque, int n, int level)
+{
+    CPUState *cs = CPU(opaque);
+
+    if (level) {
+        async_run_on_cpu(cs, leon3_start_cpu_async_work, RUN_ON_CPU_NULL);
+    }
+}
+
 static void leon3_irq_manager(CPUSPARCState *env, int intno)
 {
     leon3_irq_ack(env, intno);
@@ -236,17 +256,21 @@ static void leon3_generic_hw_init(MachineState *machine)
     AHBPnp *ahb_pnp;
     APBPnp *apb_pnp;
 
-    /* Init CPU */
-    cpu = SPARC_CPU(cpu_create(machine->cpu_type));
-    env = &cpu->env;
+    reset_info = g_malloc0(sizeof(ResetData));
 
-    cpu_sparc_set_id(env, 0);
+    for (i = 0; i < machine->smp.cpus; i++) {
+        /* Init CPU */
+        cpu = SPARC_CPU(cpu_create(machine->cpu_type));
+        env = &cpu->env;
 
-    /* Reset data */
-    reset_info        = g_new0(ResetData, 1);
-    reset_info->cpu   = cpu;
-    reset_info->sp    = LEON3_RAM_OFFSET + ram_size;
-    qemu_register_reset(main_cpu_reset, reset_info);
+        cpu_sparc_set_id(env, i);
+
+        /* Reset data */
+        reset_info->info[i].id = i;
+        reset_info->info[i].cpu = cpu;
+        reset_info->info[i].sp = LEON3_RAM_OFFSET + ram_size;
+        qemu_register_reset(leon3_cpu_reset, &reset_info->info[i]);
+    }
 
     ahb_pnp = GRLIB_AHB_PNP(qdev_new(TYPE_GRLIB_AHB_PNP));
     sysbus_realize_and_unref(SYS_BUS_DEVICE(ahb_pnp), &error_fatal);
@@ -264,14 +288,28 @@ static void leon3_generic_hw_init(MachineState *machine)
 
     /* Allocate IRQ manager */
     irqmpdev = qdev_new(TYPE_GRLIB_IRQMP);
+    object_property_set_int(OBJECT(irqmpdev), "ncpus", machine->smp.cpus,
+                            &error_fatal);
     sysbus_realize_and_unref(SYS_BUS_DEVICE(irqmpdev), &error_fatal);
-    qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_set_pil_in,
-                                        env, "pil", 1);
-    qdev_connect_gpio_out_named(irqmpdev, "grlib-irq", 0,
-                                qdev_get_gpio_in_named(DEVICE(cpu), "pil", 0));
+
+    for (i = 0; i < machine->smp.cpus; i++) {
+        cpu = reset_info->info[i].cpu;
+        env = &cpu->env;
+        qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_start_cpu,
+                                            cpu, "start_cpu", 1);
+        qdev_connect_gpio_out_named(irqmpdev, "grlib-start-cpu", i,
+                                    qdev_get_gpio_in_named(DEVICE(cpu),
+                                                           "start_cpu", 0));
+        qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_set_pil_in,
+                                            env, "pil", 1);
+        qdev_connect_gpio_out_named(irqmpdev, "grlib-irq", i,
+                                    qdev_get_gpio_in_named(DEVICE(cpu),
+                                                           "pil", 0));
+        env->irq_manager = irqmpdev;
+        env->qemu_irq_ack = leon3_irq_manager;
+    }
+
     sysbus_mmio_map(SYS_BUS_DEVICE(irqmpdev), 0, LEON3_IRQMP_OFFSET);
-    env->irq_manager = irqmpdev;
-    env->qemu_irq_ack = leon3_irq_manager;
     grlib_apb_pnp_add_entry(apb_pnp, LEON3_IRQMP_OFFSET, 0xFFF,
                             GRLIB_VENDOR_GAISLER, GRLIB_IRQMP_DEV,
                             2, 0, GRLIB_APBIO_AREA);
@@ -345,10 +383,13 @@ static void leon3_generic_hw_init(MachineState *machine)
             uint8_t *bootloader_entry;
 
             bootloader_entry = memory_region_get_ram_ptr(prom);
-            write_bootloader(env, bootloader_entry, entry);
-            env->pc = LEON3_PROM_OFFSET;
-            env->npc = LEON3_PROM_OFFSET + 4;
+            write_bootloader(&reset_info->info[0].cpu->env, bootloader_entry,
+                             entry);
             reset_info->entry = LEON3_PROM_OFFSET;
+            for (i = 0; i < machine->smp.cpus; i++) {
+                reset_info->info[i].cpu->env.pc = LEON3_PROM_OFFSET;
+                reset_info->info[i].cpu->env.npc = LEON3_PROM_OFFSET + 4;
+            }
         }
     }
 
@@ -387,6 +428,7 @@ static void leon3_generic_machine_init(MachineClass *mc)
     mc->init = leon3_generic_hw_init;
     mc->default_cpu_type = SPARC_CPU_TYPE_NAME("LEON3");
     mc->default_ram_id = "leon3.ram";
+    mc->max_cpus = MAX_CPUS;
 }
 
 DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init)
Signature · 1 line
2.25.1
#18 lore raw

PATCH 8/9 leon3: check cpu_id in the tiny bootloader

In reply to Clément Chigot

Now that SMP is possible, the asr17 must be checked in the little boot code or the secondary CPU will reinitialize the Timer and the Uart.

---
 hw/sparc/leon3.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
hw/sparc/leon3.c +20 -2
index 38fb8d9af1..7498eaa827 100644
@@ -98,13 +98,27 @@ static uint32_t *gen_store_u32(uint32_t *code, hwaddr addr, uint32_t val)
 
 /*
  * When loading a kernel in RAM the machine is expected to be in a different
- * state (eg: initialized by the bootloader). This little code reproduces
- * this behavior.
+ * state (eg: initialized by the bootloader).  This little code reproduces
+ * this behavior.  Also this code can be executed by the secondary cpus as
+ * well since it looks at the %asr17 register before doing any
+ * initialization, it allows to use the same reset address for all the
+ * cpus.
  */
 static void write_bootloader(CPUSPARCState *env, uint8_t *base,
                              hwaddr kernel_addr)
 {
     uint32_t *p = (uint32_t *) base;
+    uint32_t *sec_cpu_branch_p = NULL;
+
+    /* If we are running on a secondary CPU, jump directly to the kernel.  */
+
+    stl_p(p++, 0x85444000); /* rd %asr17, %g2      */
+    stl_p(p++, 0x8530a01c); /* srl  %g2, 0x1c, %g2 */
+    stl_p(p++, 0x80908000); /* tst  %g2            */
+    /* Fill that later.  */
+    sec_cpu_branch_p = p;
+    stl_p(p++, 0x0BADC0DE); /* bne xxx             */
+    stl_p(p++, 0x01000000); /* nop */
 
     /* Initialize the UARTs                                        */
     /* *UART_CONTROL = UART_RECEIVE_ENABLE | UART_TRANSMIT_ENABLE; */
@@ -118,6 +132,10 @@ static void write_bootloader(CPUSPARCState *env, uint8_t *base,
     /* *GPTIMER0_CONFIG = GPTIMER_ENABLE | GPTIMER_RESTART;        */
     p = gen_store_u32(p, 0x80000318, 3);
 
+    /* Now, the relative branch above can be computed.  */
+    stl_p(sec_cpu_branch_p, 0x12800000
+          + (p - sec_cpu_branch_p));
+
     /* JUMP to the entry point                                     */
     stl_p(p++, 0x82100000); /* mov %g0, %g1 */
     stl_p(p++, 0x03000000 + extract32(kernel_addr, 10, 22));
Signature · 1 line
2.25.1
#19 lore raw

PATCH 9/9 MAINTAINERS: replace Fabien by myself as Leon3 maintainer

In reply to Clément Chigot
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index 395f26ba86..a065e0b21f 100644
@@ -1694,7 +1694,7 @@ F: hw/rtc/sun4v-rtc.c
 F: include/hw/rtc/sun4v-rtc.h
 
 Leon3
-M: Fabien Chouteau <[email protected]>
+M: Clément Chigot <[email protected]>
 M: Frederic Konrad <[email protected]>
 S: Maintained
 F: hw/sparc/leon3.c
Signature · 1 line
2.25.1
#20 lore raw

Re: [PATCH 9/9] MAINTAINERS: replace Fabien by myself as Leon3 maintainer

Quoted 2 lines · Clément Chigot
CC Fabien Chouteau <[email protected]>

Typo here... Should have been [email protected]... I'll update it in v2 if one is needed. Otherwise, could the one pushing these patches make the change for me ? Thanks and sorry for that.

Quoted 21 lines
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -2
index 395f26ba86..a065e0b21f 100644
@@ -1694,7 +1694,7 @@ F: hw/rtc/sun4v-rtc.c
 F: include/hw/rtc/sun4v-rtc.h
 
 Leon3
-M: Fabien Chouteau <[email protected]>
+M: Clément Chigot <[email protected]>
 M: Frederic Konrad <[email protected]>
 S: Maintained
 F: hw/sparc/leon3.c
--

2.25.1