From patchwork Sat Sep 21 16:43:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shushura X-Patchwork-Id: 13808945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 42DEBCF9C69 for ; Sat, 21 Sep 2024 16:44:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss3DD-0008RF-8h; Sat, 21 Sep 2024 12:43:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss3DA-0008Q2-Rf for qemu-devel@nongnu.org; Sat, 21 Sep 2024 12:43:56 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss3D8-0004xm-KT for qemu-devel@nongnu.org; Sat, 21 Sep 2024 12:43:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikitashushura.com; s=protonmail; t=1726937031; x=1727196231; bh=uizx5SWZKrWYNvGBPRM27GXCaCZbelVqxcGRBJNt/MM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=F+/CN7sq2Lf5gL6ZsTsdJiVqFhZ7jbLZaP6I1JfnXh2Vd8LG/TCqcY0f59FGcd8p5 UUiT/+yDIBbx+QttAX1Zid2edOv0HXn+5ipGrsZt3Ai59368J4DoyRJCkn/Nalzp4s P7MA62b7QpQDRuQPbL11oxsiHr1kIoZH+T5Sr/QpuB3AtnKyTnJkRE88IirVzgZwbb c/5flY0OuHcPWNLGv/torr/oVDw0O9+n1Ha1wnd0UhojjhAVpLh52eQW59kF9G1Hi+ bnKGIOyNVqxzu7Gz0/2JYYtxD7lD/G5vOet2dLhxFnlKecDxcJcLRrh4/t1ZAjbMlG u+NUnVHdRcQAw== Date: Sat, 21 Sep 2024 16:43:47 +0000 To: qemu-devel@nongnu.org From: Nikita Shushura Cc: Nikita Shushura , =?utf-8?q?Cl=C3=A9ment_Chigot?= , Frederic Konrad Subject: [PATCH v2 1/2] hw/intc/grlib_irqmp: add support for extended interrupts Message-ID: <20240921164322.1883-1-me@nikitashushura.com> Feedback-ID: 120968030:user:proton X-Pm-Message-ID: 9ece10798d86a71ba647845c59ef906910b122fe MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.136; envelope-from=me@nikitashushura.com; helo=mail-40136.proton.ch X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_FMBLA_NEWDOM=1.499, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Nikita Shushura --- hw/intc/grlib_irqmp.c | 69 +++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index 37ac63fd80..e9414c054a 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -1,8 +1,6 @@ /* * QEMU GRLIB IRQMP Emulator * - * (Extended interrupt not supported) - * * SPDX-License-Identifier: MIT * * Copyright (c) 2010-2024 AdaCore @@ -38,25 +36,29 @@ #include "qemu/module.h" #include "qom/object.h" -#define IRQMP_MAX_CPU 16 -#define IRQMP_REG_SIZE 256 /* Size of memory mapped registers */ +#define IRQMP_MAX_CPU (16) +#define IRQMP_REG_SIZE (256) /* Size of memory mapped registers */ /* Memory mapped register offsets */ -#define LEVEL_OFFSET 0x00 -#define PENDING_OFFSET 0x04 -#define FORCE0_OFFSET 0x08 -#define CLEAR_OFFSET 0x0C -#define MP_STATUS_OFFSET 0x10 -#define BROADCAST_OFFSET 0x14 -#define MASK_OFFSET 0x40 -#define FORCE_OFFSET 0x80 -#define EXTENDED_OFFSET 0xC0 +#define LEVEL_OFFSET (0x00) +#define PENDING_OFFSET (0x04) +#define FORCE0_OFFSET (0x08) +#define CLEAR_OFFSET (0x0C) +#define MP_STATUS_OFFSET (0x10) +#define BROADCAST_OFFSET (0x14) +#define MASK_OFFSET (0x40) +#define FORCE_OFFSET (0x80) +#define EXTENDED_OFFSET (0xC0) /* Multiprocessor Status Register */ #define MP_STATUS_CPU_STATUS_MASK ((1 << IRQMP_MAX_CPU)-2) -#define MP_STATUS_NCPU_SHIFT 28 +#define MP_STATUS_NCPU_SHIFT (28) +#define MP_STATUS_EIRQ_OFFSET (16) + +#define MAX_PILS_STD (16) +#define MAX_PILS_EXT (32) -#define MAX_PILS 16 +#define DEFAULT_EIRQ (12) OBJECT_DECLARE_SIMPLE_TYPE(IRQMP, GRLIB_IRQMP) @@ -68,6 +70,7 @@ struct IRQMP { MemoryRegion iomem; unsigned int ncpus; + unsigned int eirq; IRQMPState *state; qemu_irq start_signal[IRQMP_MAX_CPU]; qemu_irq irq[IRQMP_MAX_CPU]; @@ -89,13 +92,26 @@ struct IRQMPState { static void grlib_irqmp_check_irqs(IRQMPState *state) { - int i; + int i, j; assert(state != NULL); assert(state->parent != NULL); for (i = 0; i < state->parent->ncpus; i++) { uint32_t pend = (state->pending | state->force[i]) & state->mask[i]; + + /* + * Checks is pending interrupt extended. + * If so, sets pending to EIRQ and acknowledges + * extended interrupt + */ + for (j = MAX_PILS_STD; j < MAX_PILS_EXT; j++) { + if ((pend & (1 << j)) != 0) { + pend = (1 << state->parent->eirq); + state->extended[i] = (j & 0xffff); + } + } + uint32_t level0 = pend & ~state->level; uint32_t level1 = pend & state->level; @@ -110,6 +126,10 @@ static void grlib_irqmp_check_irqs(IRQMPState *state) static void grlib_irqmp_ack_mask(IRQMPState *state, unsigned int cpu, uint32_t mask) { + if ((mask & (1 << state->parent->eirq)) != 0) { + mask |= (1 << state->extended[cpu]); + } + /* Clear registers */ state->pending &= ~mask; state->force[cpu] &= ~mask; @@ -144,7 +164,6 @@ static void grlib_irqmp_set_irq(void *opaque, int irq, int level) assert(s != NULL); assert(s->parent != NULL); - if (level) { trace_grlib_irqmp_set_irq(irq); @@ -278,6 +297,9 @@ static void grlib_irqmp_write(void *opaque, hwaddr addr, state->mpstatus &= ~(1 << i); } } + + /* Writing EIRQ number */ + state->mpstatus |= (state->parent->eirq << MP_STATUS_EIRQ_OFFSET); return; case BROADCAST_OFFSET: @@ -345,7 +367,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) << MP_STATUS_NCPU_SHIFT) | - ((1 << irqmp->ncpus) - 2); + ((1 << irqmp->ncpus) - 2) | + (irqmp->eirq << MP_STATUS_EIRQ_OFFSET); } static void grlib_irqmp_realize(DeviceState *dev, Error **errp) @@ -359,7 +382,14 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp) return; } - qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS); + if ((!irqmp->eirq) || (irqmp->eirq >= MAX_PILS_STD)) { + error_setg(errp, "Invalid eirq properties: " + "%u, must be 0 < eirq < %u.", irqmp->eirq, + MAX_PILS_STD); + return; + } + + qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS_EXT); /* * Transitionning from 0 to 1 starts the CPUs. The opposite can't @@ -378,6 +408,7 @@ static void grlib_irqmp_realize(DeviceState *dev, Error **errp) static Property grlib_irqmp_properties[] = { DEFINE_PROP_UINT32("ncpus", IRQMP, ncpus, 1), + DEFINE_PROP_UINT32("eirq", IRQMP, eirq, DEFAULT_EIRQ), DEFINE_PROP_END_OF_LIST(), }; From patchwork Sat Sep 21 16:43:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shushura X-Patchwork-Id: 13808944 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3EE4ECF9C5B for ; Sat, 21 Sep 2024 16:44:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss3DI-00009m-HQ; Sat, 21 Sep 2024 12:44:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss3DG-00008W-65 for qemu-devel@nongnu.org; Sat, 21 Sep 2024 12:44:02 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ss3DE-0004zC-Hq for qemu-devel@nongnu.org; Sat, 21 Sep 2024 12:44:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikitashushura.com; s=protonmail; t=1726937037; x=1727196237; bh=Xx6Js4iGgbGQOsO4T0rtRdX9oAdowWMajldiUEcOs1I=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Peogg5oUTIw11PU05vCva3MaayO7Vs8E4ZpSJiLNd3D+lxeVs5fY9RvFA4asofZ1o YepyunmQ5jngvVnGEiSIkanwwvKe9cK/8tHV/wntYA0lWkd8FtOCkf+j9epZEUu8oA ey1lK3iqD8xR1l3tQPyjh9dCo63ywEAwh+wFVdYZCZ9zZJpS62XjrUrUlnuXuXt/Tf TlbY/+BKZKuZwiIHNzAPsfqJ+C5cjlP6HrDe+e1/2rQFRvEqo5ploPmjqzzgWfsnks A4eyNX+in2ATBvRu+PF9qESUI2aw+n9/7nKI5zOnSPieiMncH1h2jrUONK15Ic0vuE Bxc1165tymmiw== Date: Sat, 21 Sep 2024 16:43:51 +0000 To: qemu-devel@nongnu.org From: Nikita Shushura Cc: Nikita Shushura , =?utf-8?q?Cl=C3=A9ment_Chigot?= , Frederic Konrad , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH v2 2/2] hw/sparc/leon3: add second uart with extended interrupt usage Message-ID: <20240921164322.1883-2-me@nikitashushura.com> In-Reply-To: <20240921164322.1883-1-me@nikitashushura.com> References: <20240921164322.1883-1-me@nikitashushura.com> Feedback-ID: 120968030:user:proton X-Pm-Message-ID: 86ea7e2cf6d3bf7a698856e714fb3bb140424ed6 MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.17; envelope-from=me@nikitashushura.com; helo=mail-4317.proton.ch X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_FMBLA_NEWDOM=1.499, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Nikita Shushura --- hw/sparc/leon3.c | 63 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 6aaa04cb19..c559854e5e 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -54,10 +54,14 @@ #define LEON3_PROM_OFFSET (0x00000000) #define LEON3_RAM_OFFSET (0x40000000) -#define MAX_CPUS 4 +#define MAX_CPUS (4) +#define LEON3_EIRQ (12) -#define LEON3_UART_OFFSET (0x80000100) -#define LEON3_UART_IRQ (3) +#define LEON3_UART0_OFFSET (0x80000100) +#define LEON3_UART0_IRQ (2) + +#define LEON3_UART1_OFFSET (0x80100100) +#define LEON3_UART1_IRQ (17) #define LEON3_IRQMP_OFFSET (0x80000200) @@ -65,7 +69,8 @@ #define LEON3_TIMER_IRQ (6) #define LEON3_TIMER_COUNT (2) -#define LEON3_APB_PNP_OFFSET (0x800FF000) +#define LEON3_APB1_PNP_OFFSET (0x800FF000) +#define LEON3_APB2_PNP_OFFSET (0x801FF000) #define LEON3_AHB_PNP_OFFSET (0xFFFFF000) typedef struct ResetData { @@ -122,7 +127,8 @@ static void write_bootloader(void *ptr, hwaddr kernel_addr) /* Initialize the UARTs */ /* *UART_CONTROL = UART_RECEIVE_ENABLE | UART_TRANSMIT_ENABLE; */ - p = gen_store_u32(p, 0x80000108, 3); + p = gen_store_u32(p, LEON3_UART0_OFFSET + 0x8, 3); + p = gen_store_u32(p, LEON3_UART1_OFFSET + 0x8, 3); /* Initialize the TIMER 0 */ /* *GPTIMER_SCALER_RELOAD = 40 - 1; */ @@ -271,7 +277,8 @@ static void leon3_generic_hw_init(MachineState *machine) DeviceState *dev, *irqmpdev; int i; AHBPnp *ahb_pnp; - APBPnp *apb_pnp; + APBPnp *apb1_pnp; + APBPnp *apb2_pnp; reset_info = g_malloc0(sizeof(ResetData)); @@ -298,10 +305,19 @@ static void leon3_generic_hw_init(MachineState *machine) GRLIB_LEON3_DEV, GRLIB_AHB_MASTER, GRLIB_CPU_AREA); - apb_pnp = GRLIB_APB_PNP(qdev_new(TYPE_GRLIB_APB_PNP)); - sysbus_realize_and_unref(SYS_BUS_DEVICE(apb_pnp), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(apb_pnp), 0, LEON3_APB_PNP_OFFSET); - grlib_ahb_pnp_add_entry(ahb_pnp, LEON3_APB_PNP_OFFSET, 0xFFF, + /* Initialize APB1 */ + apb1_pnp = GRLIB_APB_PNP(qdev_new(TYPE_GRLIB_APB_PNP)); + sysbus_realize_and_unref(SYS_BUS_DEVICE(apb1_pnp), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(apb1_pnp), 0, LEON3_APB1_PNP_OFFSET); + grlib_ahb_pnp_add_entry(ahb_pnp, LEON3_APB1_PNP_OFFSET, 0xFFF, + GRLIB_VENDOR_GAISLER, GRLIB_APBMST_DEV, + GRLIB_AHB_SLAVE, GRLIB_AHBMEM_AREA); + + /* Initialize APB2 */ + apb2_pnp = GRLIB_APB_PNP(qdev_new(TYPE_GRLIB_APB_PNP)); + sysbus_realize_and_unref(SYS_BUS_DEVICE(apb2_pnp), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(apb2_pnp), 0, LEON3_APB2_PNP_OFFSET); + grlib_ahb_pnp_add_entry(ahb_pnp, LEON3_APB2_PNP_OFFSET, 0xFFF, GRLIB_VENDOR_GAISLER, GRLIB_APBMST_DEV, GRLIB_AHB_SLAVE, GRLIB_AHBMEM_AREA); @@ -309,6 +325,8 @@ static void leon3_generic_hw_init(MachineState *machine) irqmpdev = qdev_new(TYPE_GRLIB_IRQMP); object_property_set_int(OBJECT(irqmpdev), "ncpus", machine->smp.cpus, &error_fatal); + /*object_property_set_int(OBJECT(irqmpdev), "eirq", LEON3_EIRQ,*/ + /* &error_fatal);*/ sysbus_realize_and_unref(SYS_BUS_DEVICE(irqmpdev), &error_fatal); for (i = 0; i < machine->smp.cpus; i++) { @@ -325,7 +343,7 @@ static void leon3_generic_hw_init(MachineState *machine) } sysbus_mmio_map(SYS_BUS_DEVICE(irqmpdev), 0, LEON3_IRQMP_OFFSET); - grlib_apb_pnp_add_entry(apb_pnp, LEON3_IRQMP_OFFSET, 0xFFF, + grlib_apb_pnp_add_entry(apb1_pnp, LEON3_IRQMP_OFFSET, 0xFFF, GRLIB_VENDOR_GAISLER, GRLIB_IRQMP_DEV, 2, 0, GRLIB_APBIO_AREA); @@ -417,20 +435,31 @@ static void leon3_generic_hw_init(MachineState *machine) qdev_get_gpio_in(irqmpdev, LEON3_TIMER_IRQ + i)); } - grlib_apb_pnp_add_entry(apb_pnp, LEON3_TIMER_OFFSET, 0xFFF, + grlib_apb_pnp_add_entry(apb1_pnp, LEON3_TIMER_OFFSET, 0xFFF, GRLIB_VENDOR_GAISLER, GRLIB_GPTIMER_DEV, 0, LEON3_TIMER_IRQ, GRLIB_APBIO_AREA); - /* Allocate uart */ + /* Allocate UART0 */ dev = qdev_new(TYPE_GRLIB_APB_UART); qdev_prop_set_chr(dev, "chrdev", serial_hd(0)); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_UART_OFFSET); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_UART0_OFFSET); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, + qdev_get_gpio_in(irqmpdev, LEON3_UART0_IRQ)); + grlib_apb_pnp_add_entry(apb1_pnp, LEON3_UART0_OFFSET, 0xFFF, + GRLIB_VENDOR_GAISLER, GRLIB_APBUART_DEV, 1, + LEON3_UART0_IRQ, GRLIB_APBIO_AREA); + + /* Allocate UART1 */ + dev = qdev_new(TYPE_GRLIB_APB_UART); + qdev_prop_set_chr(dev, "chrdev", serial_hd(1)); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_UART1_OFFSET); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, - qdev_get_gpio_in(irqmpdev, LEON3_UART_IRQ)); - grlib_apb_pnp_add_entry(apb_pnp, LEON3_UART_OFFSET, 0xFFF, + qdev_get_gpio_in(irqmpdev, LEON3_UART1_IRQ)); + grlib_apb_pnp_add_entry(apb1_pnp, LEON3_UART1_OFFSET, 0xFFF, GRLIB_VENDOR_GAISLER, GRLIB_APBUART_DEV, 1, - LEON3_UART_IRQ, GRLIB_APBIO_AREA); + LEON3_UART1_IRQ, GRLIB_APBIO_AREA); } static void leon3_generic_machine_init(MachineClass *mc)