From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
To: Huacai Chen <zltjiangshi@gmail.com>
Cc: "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Huacai Chen" <chenhuacai@gmail.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Huacai Chen" <chenhc@lemote.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: Re: [PATCH for-5.1 V5 2/4] hw/intc: Add Loongson liointc support
Date: Tue, 23 Jun 2020 16:50:21 +0200 [thread overview]
Message-ID: <CAHiYmc7kWNDpb5btfOSmOJT0yAFi31XQ515+f_1avZfwqBdA2A@mail.gmail.com> (raw)
In-Reply-To: <1592914438-30317-3-git-send-email-chenhc@lemote.com>
[-- Attachment #1: Type: text/plain, Size: 9102 bytes --]
уто, 23. јун 2020. у 14:13 Huacai Chen <zltjiangshi@gmail.com> је
написао/ла:
> Loongson-3 has an integrated liointc (Local I/O interrupt controller).
> It is similar to goldfish interrupt controller, but more powerful (e.g.,
>
Any pointers to documentation?
Thanks,
Aleksandar
> it can route external interrupt to multi-cores).
>
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
> hw/intc/Kconfig | 3 +
> hw/intc/Makefile.objs | 1 +
> hw/intc/loongson_liointc.c | 246
> +++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 250 insertions(+)
> create mode 100644 hw/intc/loongson_liointc.c
>
> diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
> index a189d6f..264d82d 100644
> --- a/hw/intc/Kconfig
> +++ b/hw/intc/Kconfig
> @@ -61,3 +61,6 @@ config S390_FLIC_KVM
>
> config OMPIC
> bool
> +
> +config LOONGSON_LIOINTC
> + bool
> diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
> index a61e672..9a26fbe 100644
> --- a/hw/intc/Makefile.objs
> +++ b/hw/intc/Makefile.objs
> @@ -50,3 +50,4 @@ obj-$(CONFIG_MIPS_CPS) += mips_gic.o
> obj-$(CONFIG_NIOS2) += nios2_iic.o
> obj-$(CONFIG_OMPIC) += ompic.o
> obj-$(CONFIG_IBEX) += ibex_plic.o
> +obj-$(CONFIG_LOONGSON_LIOINTC) += loongson_liointc.o
> diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c
> new file mode 100644
> index 0000000..d4c1b48
> --- /dev/null
> +++ b/hw/intc/loongson_liointc.c
> @@ -0,0 +1,246 @@
> +/*
> + * QEMU Loongson Local I/O interrupt controler.
> + *
> + * Copyright (c) 2020 Jiaxun Yang <jiaxun.yang@flygoat.com>
> + *
> + * 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.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/sysbus.h"
> +#include "qemu/module.h"
> +#include "hw/irq.h"
> +#include "hw/qdev-properties.h"
> +
> +#define D(x)
> +
> +#define NUM_IRQS 32
> +
> +#define NUM_CORES 4
> +#define NUM_IPS 4
> +#define NUM_PARENTS (NUM_CORES * NUM_IPS)
> +#define PARENT_COREx_IPy(x, y) (NUM_IPS * x + y)
> +
> +#define R_MAPPER_START 0x0
> +#define R_MAPPER_END 0x20
> +#define R_ISR R_MAPPER_END
> +#define R_IEN 0x24
> +#define R_IEN_SET 0x28
> +#define R_IEN_CLR 0x2c
> +#define R_PERCORE_ISR(x) (0x40 + 0x8 * x)
> +#define R_END 0x64
> +
> +#define TYPE_LOONGSON_LIOINTC "loongson.liointc"
> +#define LOONGSON_LIOINTC(obj) OBJECT_CHECK(struct loongson_liointc,
> (obj), TYPE_LOONGSON_LIOINTC)
> +
> +struct loongson_liointc
> +{
> + SysBusDevice parent_obj;
> +
> + MemoryRegion mmio;
> + qemu_irq parent_irq[NUM_PARENTS];
> +
> + uint8_t mapper[NUM_IRQS]; /* 0:3 for core, 4:7 for IP */
> + uint32_t isr;
> + uint32_t ien;
> + uint32_t per_core_isr[NUM_CORES];
> +
> + /* state of the interrupt input pins */
> + uint32_t pin_state;
> + bool parent_state[NUM_PARENTS];
> +};
> +
> +static void update_irq(struct loongson_liointc *p)
> +{
> + uint32_t irq, core, ip;
> + uint32_t per_ip_isr[NUM_IPS] = {0};
> +
> + /* level triggered interrupt */
> + p->isr = p->pin_state;
> +
> + /* Clear disabled IRQs */
> + p->isr &= p->ien;
> +
> + /* Clear per_core_isr */
> + for (core = 0; core < NUM_CORES; core++) {
> + p->per_core_isr[core] = 0;
> + }
> +
> + /* Update per_core_isr and per_ip_isr */
> + for (irq = 0; irq < NUM_IRQS; irq++) {
> + if (!(p->isr & (1 << irq))) {
> + continue;
> + }
> +
> + for (core = 0; core < NUM_CORES; core++) {
> + if ((p->mapper[irq] & (1 << core))) {
> + p->per_core_isr[core] |= (1 << irq);
> + }
> + }
> +
> + for (ip = 0; ip < NUM_IPS; ip++) {
> + if ((p->mapper[irq] & (1 << (ip + 4)))) {
> + per_ip_isr[ip] |= (1 << irq);
> + }
> + }
> + }
> +
> + /* Emit IRQ to parent! */
> + for (core = 0; core < NUM_CORES; core++) {
> + for (ip = 0; ip < NUM_IPS; ip++) {
> + int parent = PARENT_COREx_IPy(core, ip);
> + if (p->parent_state[parent] !=
> + (!!p->per_core_isr[core] && !!per_ip_isr[ip])) {
> + p->parent_state[parent] = !p->parent_state[parent];
> + qemu_set_irq(p->parent_irq[parent],
> p->parent_state[parent]);
> + }
> + }
> + }
> +}
> +
> +static uint64_t
> +liointc_read(void *opaque, hwaddr addr, unsigned int size)
> +{
> + struct loongson_liointc *p = opaque;
> + uint32_t r = 0;
> +
> + /* Mapper is 1 byte */
> + if (size == 1 && addr < R_MAPPER_END) {
> + r = p->mapper[addr];
> + goto out;
> + }
> +
> + /* Rest is 4 byte */
> + if (size != 4 || (addr % 4)) {
> + goto out;
> + }
> +
> + if (addr >= R_PERCORE_ISR(0) &&
> + addr < R_PERCORE_ISR(NUM_CORES)) {
> + int core = (addr - R_PERCORE_ISR(0)) / 4;
> + r = p->per_core_isr[core];
> + goto out;
> + }
> +
> + switch (addr) {
> + case R_ISR:
> + r = p->isr;
> + break;
> + case R_IEN:
> + r = p->ien;
> + break;
> + default:
> + break;
> + }
> +
> +out:
> + D(qemu_log("%s: size=%d addr=%lx val=%x\n", __func__, size, addr, r));
> + return r;
> +}
> +
> +static void
> +liointc_write(void *opaque, hwaddr addr,
> + uint64_t val64, unsigned int size)
> +{
> + struct loongson_liointc *p = opaque;
> + uint32_t value = val64;
> +
> + D(qemu_log("%s: size=%d, addr=%lx val=%x\n", __func__, size, addr,
> value));
> +
> + /* Mapper is 1 byte */
> + if (size == 1 && addr < R_MAPPER_END) {
> + p->mapper[addr] = value;
> + goto out;
> + }
> +
> + /* Rest is 4 byte */
> + if (size != 4 || (addr % 4)) {
> + goto out;
> + }
> +
> + if (addr >= R_PERCORE_ISR(0) &&
> + addr < R_PERCORE_ISR(NUM_CORES)) {
> + int core = (addr - R_PERCORE_ISR(0)) / 4;
> + p->per_core_isr[core] = value;
> + goto out;
> + }
> +
> + switch (addr) {
> + case R_IEN_SET:
> + p->ien |= value;
> + break;
> + case R_IEN_CLR:
> + p->ien &= ~value;
> + break;
> + default:
> + break;
> + }
> +
> +out:
> + update_irq(p);
> +}
> +
> +static const MemoryRegionOps pic_ops = {
> + .read = liointc_read,
> + .write = liointc_write,
> + .endianness = DEVICE_NATIVE_ENDIAN,
> + .valid = {
> + .min_access_size = 1,
> + .max_access_size = 4
> + }
> +};
> +
> +static void irq_handler(void *opaque, int irq, int level)
> +{
> + struct loongson_liointc *p = opaque;
> +
> + p->pin_state &= ~(1 << irq);
> + p->pin_state |= level << irq;
> + update_irq(p);
> +}
> +
> +static void loongson_liointc_init(Object *obj)
> +{
> + struct loongson_liointc *p = LOONGSON_LIOINTC(obj);
> + int i;
> +
> + qdev_init_gpio_in(DEVICE(obj), irq_handler, 32);
> +
> + for (i = 0; i < NUM_PARENTS; i++) {
> + sysbus_init_irq(SYS_BUS_DEVICE(obj), &p->parent_irq[i]);
> + }
> +
> + memory_region_init_io(&p->mmio, obj, &pic_ops, p,
> + "loongson.liointc", R_END);
> + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &p->mmio);
> +}
> +
> +static const TypeInfo loongson_liointc_info = {
> + .name = TYPE_LOONGSON_LIOINTC,
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(struct loongson_liointc),
> + .instance_init = loongson_liointc_init,
> +};
> +
> +static void loongson_liointc_register_types(void)
> +{
> + type_register_static(&loongson_liointc_info);
> +}
> +
> +type_init(loongson_liointc_register_types)
> --
> 2.7.0
>
>
[-- Attachment #2: Type: text/html, Size: 11172 bytes --]
next prev parent reply other threads:[~2020-06-23 14:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 12:13 [PATCH for-5.1 V5 0/4] mips: Add Loongson-3 machine support (with KVM) Huacai Chen
2020-06-23 12:13 ` [PATCH for-5.1 V5 1/4] hw/mips: Implement the kvm_type() hook in MachineClass Huacai Chen
2020-06-23 12:13 ` [PATCH for-5.1 V5 2/4] hw/intc: Add Loongson liointc support Huacai Chen
2020-06-23 14:02 ` Aleksandar Markovic
2020-06-23 14:50 ` Aleksandar Markovic [this message]
2020-06-24 1:23 ` Jiaxun Yang
2020-06-23 12:13 ` [PATCH for-5.1 V5 3/4] hw/mips: Add Loongson-3 machine support (with KVM) Huacai Chen
2020-06-23 13:19 ` Aleksandar Markovic
2020-06-23 13:46 ` Aleksandar Markovic
2020-06-24 11:26 ` Aleksandar Markovic
2020-06-26 10:30 ` Huacai Chen
2020-06-23 14:04 ` Aleksandar Markovic
2020-06-24 6:34 ` Huacai Chen
2020-06-23 12:13 ` [PATCH for-5.1 V5 4/4] MAINTAINERS: Add Loongson-3 maintainer and reviewer Huacai Chen
2020-06-23 13:50 ` Aleksandar Markovic
2020-06-24 6:32 ` Huacai Chen
2020-06-23 13:02 ` [PATCH for-5.1 V5 0/4] mips: Add Loongson-3 machine support (with KVM) no-reply
2020-06-23 13:58 ` Aleksandar Markovic
2020-06-24 6:12 ` Huacai Chen
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=CAHiYmc7kWNDpb5btfOSmOJT0yAFi31XQ515+f_1avZfwqBdA2A@mail.gmail.com \
--to=aleksandar.qemu.devel@gmail.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=chenhc@lemote.com \
--cc=chenhuacai@gmail.com \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=zltjiangshi@gmail.com \
/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).