From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Marc-André Lureau" <marcandre.lureau@redhat.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Subject: Re: [PATCH v4 30/37] cris: improve passing PIC interrupt vector to the CPU
Date: Wed, 20 Nov 2019 17:32:45 +0100 [thread overview]
Message-ID: <c6c2703c-438f-df1c-7b5b-c4c119c5fe11@redhat.com> (raw)
In-Reply-To: <20191120152442.26657-31-marcandre.lureau@redhat.com>
On 11/20/19 4:24 PM, Marc-André Lureau wrote:
> Instead of accessing cpu interrupt vector directly from PIC, send the
> vector value over the qemu_irq.
>
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> hw/cris/axis_dev88.c | 4 ----
> hw/intc/etraxfs_pic.c | 26 +-------------------------
> target/cris/cpu.c | 8 ++++++++
> target/cris/cpu.h | 1 +
> 4 files changed, 10 insertions(+), 29 deletions(-)
>
> diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
> index 940c7dd122..be7760476a 100644
> --- a/hw/cris/axis_dev88.c
> +++ b/hw/cris/axis_dev88.c
> @@ -253,7 +253,6 @@ void axisdev88_init(MachineState *machine)
> const char *kernel_filename = machine->kernel_filename;
> const char *kernel_cmdline = machine->kernel_cmdline;
> CRISCPU *cpu;
> - CPUCRISState *env;
> DeviceState *dev;
> SysBusDevice *s;
> DriveInfo *nand;
> @@ -267,7 +266,6 @@ void axisdev88_init(MachineState *machine)
>
> /* init CPUs */
> cpu = CRIS_CPU(cpu_create(machine->cpu_type));
> - env = &cpu->env;
>
> /* allocate RAM */
> memory_region_allocate_system_memory(phys_ram, NULL, "axisdev88.ram",
> @@ -297,8 +295,6 @@ void axisdev88_init(MachineState *machine)
>
>
> dev = qdev_create(NULL, "etraxfs,pic");
> - /* FIXME: Is there a proper way to signal vectors to the CPU core? */
> - qdev_prop_set_ptr(dev, "interrupt_vector", &env->interrupt_vector);
> qdev_init_nofail(dev);
> s = SYS_BUS_DEVICE(dev);
> sysbus_mmio_map(s, 0, 0x3001c000);
> diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c
> index 77f652acec..12988c7aa9 100644
> --- a/hw/intc/etraxfs_pic.c
> +++ b/hw/intc/etraxfs_pic.c
> @@ -27,8 +27,6 @@
> #include "qemu/module.h"
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> -//#include "pc.h"
> -//#include "etraxfs.h"
>
> #define D(x)
>
> @@ -48,7 +46,6 @@ struct etrax_pic
> SysBusDevice parent_obj;
>
> MemoryRegion mmio;
> - void *interrupt_vector;
> qemu_irq parent_irq;
> qemu_irq parent_nmi;
> uint32_t regs[R_MAX];
> @@ -79,11 +76,7 @@ static void pic_update(struct etrax_pic *fs)
> }
> }
>
> - if (fs->interrupt_vector) {
> - /* hack alert: ptr property */
> - *(uint32_t*)(fs->interrupt_vector) = vector;
> - }
> - qemu_set_irq(fs->parent_irq, !!vector);
> + qemu_set_irq(fs->parent_irq, vector);
> }
>
> static uint64_t
> @@ -163,28 +156,11 @@ static void etraxfs_pic_init(Object *obj)
> sysbus_init_mmio(sbd, &s->mmio);
> }
>
> -static Property etraxfs_pic_properties[] = {
> - DEFINE_PROP_PTR("interrupt_vector", struct etrax_pic, interrupt_vector),
> - DEFINE_PROP_END_OF_LIST(),
> -};
> -
> -static void etraxfs_pic_class_init(ObjectClass *klass, void *data)
> -{
> - DeviceClass *dc = DEVICE_CLASS(klass);
> -
> - dc->props = etraxfs_pic_properties;
> - /*
> - * Note: pointer property "interrupt_vector" may remain null, thus
> - * no need for dc->user_creatable = false;
> - */
> -}
> -
> static const TypeInfo etraxfs_pic_info = {
> .name = TYPE_ETRAX_FS_PIC,
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof(struct etrax_pic),
> .instance_init = etraxfs_pic_init,
> - .class_init = etraxfs_pic_class_init,
> };
>
> static void etraxfs_pic_register_types(void)
> diff --git a/target/cris/cpu.c b/target/cris/cpu.c
> index 7adfd6caf4..6a857f548d 100644
> --- a/target/cris/cpu.c
> +++ b/target/cris/cpu.c
> @@ -147,6 +147,14 @@ static void cris_cpu_set_irq(void *opaque, int irq, int level)
> CPUState *cs = CPU(cpu);
> int type = irq == CRIS_CPU_IRQ ? CPU_INTERRUPT_HARD : CPU_INTERRUPT_NMI;
>
> + if (irq == CRIS_CPU_IRQ) {
> + /*
> + * The PIC passes us the vector for the IRQ as the value it sends
> + * over the qemu_irq line
> + */
> + cpu->env.interrupt_vector = level;
I worked on a series that change level to a boolean, but having a way to
pass a vectored IRQ via the IRQ API seems useful.
Maybe we should clarify the qemu_irq_handler prototype documentation.
Unfortunately it is declared in "qemu/typedefs.h", and the documentation
is expected in "hw/irq.h".
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> + }
> +
> if (level) {
> cpu_interrupt(cs, type);
> } else {
> diff --git a/target/cris/cpu.h b/target/cris/cpu.h
> index aba0a66474..a7c2a8e15b 100644
> --- a/target/cris/cpu.h
> +++ b/target/cris/cpu.h
> @@ -34,6 +34,7 @@
> #define CPU_INTERRUPT_NMI CPU_INTERRUPT_TGT_EXT_3
>
> /* CRUS CPU device objects interrupt lines. */
> +/* PIC passes the vector for the IRQ as the value of it sends over qemu_irq */
> #define CRIS_CPU_IRQ 0
> #define CRIS_CPU_NMI 1
>
>
next prev parent reply other threads:[~2019-11-20 16:33 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 15:24 [PATCH v4 00/37] Clean-ups: qom-ify serial and remove QDEV_PROP_PTR Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 01/37] qdev: remove unused qdev_prop_int64 Marc-André Lureau
2019-12-02 5:22 ` Markus Armbruster
2019-12-02 10:29 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 02/37] sysbus: remove unused sysbus_try_create* Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 03/37] sysbus: remove outdated comment Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 04/37] chardev: generate an internal id when none given Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 05/37] serial-pci-multi: factor out multi_serial_get_port_count() Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 06/37] serial: initial qom-ification Marc-André Lureau
2019-11-20 16:40 ` Philippe Mathieu-Daudé
2019-11-20 16:45 ` Marc-André Lureau
2019-11-21 13:39 ` Peter Maydell
2019-11-20 15:24 ` [PATCH v4 07/37] serial: register vmsd with DeviceClass Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 08/37] serial: add "chardev" property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 09/37] serial: add "baudbase" property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 10/37] serial: realize the serial device Marc-André Lureau
2019-11-20 16:12 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 11/37] serial: replace serial_exit_core() with unrealize Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 12/37] serial: start making SerialMM a sysbus device Marc-André Lureau
2019-11-21 13:47 ` Peter Maydell
2019-11-21 18:15 ` Marc-André Lureau
2019-11-21 18:24 ` Peter Maydell
2019-11-21 18:51 ` Marc-André Lureau
2019-11-22 10:10 ` Peter Maydell
2019-11-22 12:02 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 13/37] serial-mm: add "regshift" property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 14/37] serial-mm: add endianness property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 15/37] serial-mm: use sysbus facilities Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 16/37] serial: make SerialIO a sysbus device Marc-André Lureau
2019-11-20 16:18 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 17/37] mips: inline serial_init() Marc-André Lureau
2019-11-20 16:17 ` Philippe Mathieu-Daudé
2019-11-25 10:12 ` Aleksandar Markovic
2019-11-25 10:15 ` Marc-André Lureau
2019-11-25 13:33 ` Aleksandar Markovic
2019-11-25 19:13 ` Marc-André Lureau
2019-11-27 12:22 ` Aleksandar Markovic
2019-11-20 15:24 ` [PATCH v4 18/37] mips: baudbase is 115200 by default Marc-André Lureau
2019-11-21 13:39 ` Peter Maydell
2019-11-25 10:07 ` Aleksandar Markovic
2019-11-25 10:12 ` Marc-André Lureau
2019-11-25 11:26 ` Philippe Mathieu-Daudé
2019-11-25 12:22 ` Aleksandar Markovic
2019-11-25 12:54 ` Philippe Mathieu-Daudé
2019-11-25 13:03 ` Philippe Mathieu-Daudé
2019-11-27 12:07 ` Marc-André Lureau
2019-11-27 12:20 ` Aleksandar Markovic
2019-11-20 15:24 ` [PATCH v4 19/37] mips: use sysbus_add_io() Marc-André Lureau
2019-11-21 13:40 ` Peter Maydell
2019-11-27 12:28 ` Aleksandar Markovic
2019-12-15 5:40 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 20/37] mips: use sysbus_mmio_get_region() instead of internal fields Marc-André Lureau
2019-11-21 13:48 ` Peter Maydell
2019-11-27 12:23 ` Aleksandar Markovic
2019-12-15 5:39 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 21/37] sm501: make SerialMM a child, export chardev property Marc-André Lureau
2019-11-21 14:00 ` Peter Maydell
2019-11-25 19:47 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 22/37] vmmouse: replace PROP_PTR with PROP_LINK Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 23/37] lance: " Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 24/37] etraxfs: remove PROP_PTR usage Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 25/37] dp8393x: replace PROP_PTR with PROP_LINK Marc-André Lureau
2019-11-20 22:58 ` Laurent Vivier
2019-11-20 15:24 ` [PATCH v4 26/37] leon3: use qemu_irq framework instead of callback as property Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 27/37] leon3: use qdev gpio facilities for the PIL Marc-André Lureau
2019-11-21 13:51 ` Peter Maydell
2019-12-15 6:10 ` Philippe Mathieu-Daudé
2019-12-19 12:44 ` Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 28/37] qdev: use g_strcmp0() instead of open-coding it Marc-André Lureau
2019-11-20 16:25 ` Philippe Mathieu-Daudé
2019-11-20 17:10 ` Eduardo Habkost
2019-11-20 15:24 ` [PATCH v4 29/37] RFC: mips/cps: fix setting saar property Marc-André Lureau
2019-12-15 5:56 ` Philippe Mathieu-Daudé
2019-12-16 19:36 ` [EXTERNAL]Re: " Aleksandar Markovic
2019-12-19 13:04 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 30/37] cris: improve passing PIC interrupt vector to the CPU Marc-André Lureau
2019-11-20 16:32 ` Philippe Mathieu-Daudé [this message]
2019-11-20 15:24 ` [PATCH v4 31/37] smbus-eeprom: remove PROP_PTR Marc-André Lureau
2019-11-21 22:43 ` Corey Minyard
2019-11-29 9:06 ` Marc-André Lureau
2019-11-29 14:39 ` Corey Minyard
2019-11-22 11:07 ` Philippe Mathieu-Daudé
2019-11-22 11:12 ` Marc-André Lureau
2019-11-22 11:15 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 32/37] omap-intc: " Marc-André Lureau
2019-12-15 5:42 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 33/37] omap-i2c: " Marc-André Lureau
2019-12-15 5:43 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 34/37] omap-gpio: " Marc-André Lureau
2019-12-15 5:44 ` Philippe Mathieu-Daudé
2019-11-20 15:24 ` [PATCH v4 35/37] qdev: remove PROP_MEMORY_REGION Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 36/37] qdev: remove QDEV_PROP_PTR Marc-André Lureau
2019-11-20 15:24 ` [PATCH v4 37/37] qdev/qom: remove some TODO limitations now that PROP_PTR is gone Marc-André Lureau
2019-12-01 10:19 ` [PATCH v4 00/37] Clean-ups: qom-ify serial and remove QDEV_PROP_PTR Marc-André Lureau
2019-12-01 12:15 ` [PATCH v6 " Aleksandar Markovic
2019-12-01 15:35 ` Marc-André Lureau
2019-12-01 19:05 ` Aleksandar Markovic
2019-12-01 19:28 ` Aleksandar Markovic
2019-12-01 17:18 ` [PATCH v4 " Peter Maydell
2019-12-01 17:27 ` Marc-André Lureau
2019-12-01 18:10 ` Peter Maydell
2019-12-02 11:17 ` Marc-André Lureau
2019-12-12 20:17 ` Dr. David Alan Gilbert
2019-12-13 16:34 ` Marc-André Lureau
2019-12-11 12:01 ` Marc-André Lureau
2019-12-15 6:11 ` Philippe Mathieu-Daudé
2019-12-19 13:53 ` Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c6c2703c-438f-df1c-7b5b-c4c119c5fe11@redhat.com \
--to=philmd@redhat.com \
--cc=edgar.iglesias@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).