From patchwork Tue Jan 21 07:04:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamin Lin X-Patchwork-Id: 13945865 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 EF44FC02185 for ; Tue, 21 Jan 2025 07:07:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ta8K3-0006rQ-Pk; Tue, 21 Jan 2025 02:05:15 -0500 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 1ta8K1-0006oe-47; Tue, 21 Jan 2025 02:05:13 -0500 Received: from mail.aspeedtech.com ([211.20.114.72] helo=TWMBX01.aspeed.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ta8Jw-0001Q8-9O; Tue, 21 Jan 2025 02:05:10 -0500 Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 21 Jan 2025 15:04:27 +0800 Received: from localhost.localdomain (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Tue, 21 Jan 2025 15:04:27 +0800 To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Steven Lee , Troy Lee , Andrew Jeffery , "Joel Stanley" , "open list:ASPEED BMCs" , "open list:All patches CC here" CC: , , Subject: [PATCH v1 08/18] hw/intc/aspeed: Add Support for Multi-Output IRQ Handling Date: Tue, 21 Jan 2025 15:04:14 +0800 Message-ID: <20250121070424.2465942-9-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250121070424.2465942-1-jamin_lin@aspeedtech.com> References: <20250121070424.2465942-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Received-SPF: pass client-ip=211.20.114.72; envelope-from=jamin_lin@aspeedtech.com; helo=TWMBX01.aspeed.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_FAIL=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Reply-to: Jamin Lin X-Patchwork-Original-From: Jamin Lin via From: Jamin Lin Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This update introduces support for handling multi-output IRQs in the AST2700 interrupt controller (INTC), specifically for GICINT192_201. GICINT192_201 maps 1:10 to input IRQ 0 and output IRQs 0 to 9. Each status bit corresponds to a specific IRQ. Implemented "aspeed_intc_set_irq_handler_multi_outpins" to handle IRQs with multiple output pins. Introduced "aspeed_2700_intc_status_handler_multi_outpins" for managing status registers associated with multi-output IRQs. Added new IRQ definitions for GICINT192_201 in INTC0. Adjusted the IRQ array to accommodate 10 input pins and 19 output pins, aligning with the new GICINT192_201 mappings. +------------------------------+ | INTC0 | |inpin[0:0]--------->outpin[0] | |inpin[0:1]|-------->outpin[1] | |inpin[0:2]|-------->outpin[2] | |inpin[0:3]|-------->outpin[3] | orgates[0]+------> |inpin[0:4]|-------->outpin[4] | |inpin[0:5]|-------->outpin[5] | |inpin[0:6]|-------->outpin[6] | |inpin[0:7]|-------->outpin[7] | |inpin[0:8]|-------->outpin[8] | |inpin[0:9]--------->outpin[9] | | | orgates[1]------> |inpin[1]+---------->outpin[10]| orgates[2]|-----> |inpin[2]|---------->outpin[11]| orgates[3]|-----> |inpin[3]|---------->outpin[12]| orgates[4]|-----> |inpin[4]|---------->outpin[13]| orgates[5]|-----> |inpin[5]|---------->outpin[14]| orgates[6]|-----> |inpin[6]|---------->outpin[15]| orgates[7]|-----> |inpin[7]|---------->outpin[16]| orgates[8]|-----> |inpin[8]|---------->outpin[17]| orgates[9]+-----> |inpin[9]|---------->outpin[18]| +------------------------------+ Signed-off-by: Jamin Lin --- hw/intc/aspeed_intc.c | 137 ++++++++++++++++++++++++++++++---- hw/intc/trace-events | 1 + include/hw/intc/aspeed_intc.h | 4 +- 3 files changed, 126 insertions(+), 16 deletions(-) diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index 8684d41ef6..2f704d6cd2 100644 --- a/hw/intc/aspeed_intc.c +++ b/hw/intc/aspeed_intc.c @@ -33,17 +33,20 @@ REG32(INTC0_GICINT135_EN, 0x1700) REG32(INTC0_GICINT135_STATUS, 0x1704) REG32(INTC0_GICINT136_EN, 0x1800) REG32(INTC0_GICINT136_STATUS, 0x1804) +REG32(INTC0_GICINT192_201_EN, 0x1B00) +REG32(INTC0_GICINT192_201_STATUS, 0x1B04) static AspeedINTCIRQ aspeed_2700_intc0_irqs[ASPEED_INTC_MAX_INPINS] = { - {0, 0, 1, R_INTC0_GICINT128_EN, R_INTC0_GICINT128_STATUS}, - {1, 1, 1, R_INTC0_GICINT129_EN, R_INTC0_GICINT129_STATUS}, - {2, 2, 1, R_INTC0_GICINT130_EN, R_INTC0_GICINT130_STATUS}, - {3, 3, 1, R_INTC0_GICINT131_EN, R_INTC0_GICINT131_STATUS}, - {4, 4, 1, R_INTC0_GICINT132_EN, R_INTC0_GICINT132_STATUS}, - {5, 5, 1, R_INTC0_GICINT133_EN, R_INTC0_GICINT133_STATUS}, - {6, 6, 1, R_INTC0_GICINT134_EN, R_INTC0_GICINT134_STATUS}, - {7, 7, 1, R_INTC0_GICINT135_EN, R_INTC0_GICINT135_STATUS}, - {8, 8, 1, R_INTC0_GICINT136_EN, R_INTC0_GICINT136_STATUS}, + {0, 0, 10, R_INTC0_GICINT192_201_EN, R_INTC0_GICINT192_201_STATUS}, + {1, 10, 1, R_INTC0_GICINT128_EN, R_INTC0_GICINT128_STATUS}, + {2, 11, 1, R_INTC0_GICINT129_EN, R_INTC0_GICINT129_STATUS}, + {3, 12, 1, R_INTC0_GICINT130_EN, R_INTC0_GICINT130_STATUS}, + {4, 13, 1, R_INTC0_GICINT131_EN, R_INTC0_GICINT131_STATUS}, + {5, 14, 1, R_INTC0_GICINT132_EN, R_INTC0_GICINT132_STATUS}, + {6, 15, 1, R_INTC0_GICINT133_EN, R_INTC0_GICINT133_STATUS}, + {7, 16, 1, R_INTC0_GICINT134_EN, R_INTC0_GICINT134_STATUS}, + {8, 17, 1, R_INTC0_GICINT135_EN, R_INTC0_GICINT135_STATUS}, + {9, 18, 1, R_INTC0_GICINT136_EN, R_INTC0_GICINT136_STATUS}, }; static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic, @@ -118,9 +121,46 @@ static void aspeed_intc_set_irq_handler(AspeedINTCState *s, } } +static void aspeed_intc_set_irq_handler_multi_outpins(AspeedINTCState *s, + const AspeedINTCIRQ *irq, uint32_t select) +{ + int i; + + for (i = 0; i < irq->num_outpins; i++) { + if (select & BIT(i)) { + if (s->mask[irq->inpin_idx] & BIT(i) || + s->regs[irq->status_addr] & BIT(i)) { + /* + * a. mask bit is not 0 means in ISR mode sources interrupt + * routine are executing. + * b. status bit is not 0 means previous source interrupt + * does not be executed, yet. + * + * save source interrupt to pending bit. + */ + s->pending[irq->inpin_idx] |= BIT(i); + trace_aspeed_intc_pending_irq(irq->inpin_idx, + s->pending[irq->inpin_idx]); + } else { + /* + * notify firmware which source interrupt are coming + * by setting status bit + */ + s->regs[irq->status_addr] |= BIT(i); + trace_aspeed_intc_trigger_irq(irq->inpin_idx, + irq->outpin_idx + i, + s->regs[irq->status_addr]); + aspeed_intc_update(s, irq->inpin_idx, irq->outpin_idx + i, 1); + } + } + } +} + /* - * GICINT128 to GICINT136 map 1:1 to input and output IRQs 0 to 8. - * The value of input IRQ should be between 0 and the number of inputs. + * GICINT192_201 maps 1:10 to input IRQ 0 and output IRQs 0 to 9. + * GICINT128 to GICINT136 map 1:1 to input IRQs 1 to 9 and output + * IRQs 10 to 18. The value of input IRQ should be between 0 and + * the number of input pins. */ static void aspeed_intc_set_irq(void *opaque, int irq_idx, int level) { @@ -161,7 +201,11 @@ static void aspeed_intc_set_irq(void *opaque, int irq_idx, int level) trace_aspeed_intc_select(select); - aspeed_intc_set_irq_handler(s, irq, select); + if (irq->num_outpins > 1) { + aspeed_intc_set_irq_handler_multi_outpins(s, irq, select); + } else { + aspeed_intc_set_irq_handler(s, irq, select); + } } static void aspeed_2700_intc_enable_handler(AspeedINTCState *s, uint32_t addr, @@ -270,6 +314,67 @@ static void aspeed_2700_intc_status_handler(AspeedINTCState *s, uint32_t addr, } } +static void aspeed_2700_intc_status_handler_multi_outpins(AspeedINTCState *s, + uint32_t addr, uint64_t data) +{ + AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s); + const AspeedINTCIRQ *irq; + int i; + + if (!data) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n", __func__); + return; + } + + irq = aspeed_intc_get_irq(aic, addr); + + if (irq->inpin_idx >= aic->num_inpins) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid input pin index number: %d\n", + __func__, irq->inpin_idx); + return; + } + + /* clear status */ + s->regs[addr] &= ~data; + + /* + * The status registers are used for notify sources ISR are executed. + * If one source ISR is executed, it will clear one bit. + * If it clear all bits, it means to initialize this register status + * rather than sources ISR are executed. + */ + if (data == 0xffffffff) { + return; + } + + for (i = 0; i < irq->num_outpins; i++) { + /* All source ISR executions are done from a specific bit */ + if (data & BIT(i)) { + trace_aspeed_intc_all_isr_done_bit(irq->inpin_idx, i); + if (s->pending[irq->inpin_idx] & BIT(i)) { + /* + * Handle pending source interrupt. + * Notify firmware which source interrupt is pending + * by setting the status bit. + */ + s->regs[addr] |= BIT(i); + s->pending[irq->inpin_idx] &= ~BIT(i); + trace_aspeed_intc_trigger_irq(irq->inpin_idx, + irq->outpin_idx + i, + s->regs[addr]); + aspeed_intc_update(s, irq->inpin_idx, + irq->outpin_idx + i, 1); + } else { + /* clear irq for the specific bit */ + trace_aspeed_intc_clear_irq(irq->inpin_idx, + irq->outpin_idx + i, 0); + aspeed_intc_update(s, irq->inpin_idx, irq->outpin_idx + i, 0); + } + } + } +} + static uint64_t aspeed_2700_intc0_read(void *opaque, hwaddr offset, unsigned int size) { @@ -317,6 +422,7 @@ static void aspeed_2700_intc0_write(void *opaque, hwaddr offset, uint64_t data, case R_INTC0_GICINT134_EN: case R_INTC0_GICINT135_EN: case R_INTC0_GICINT136_EN: + case R_INTC0_GICINT192_201_EN: aspeed_2700_intc_enable_handler(s, addr, data); break; case R_INTC0_GICINT128_STATUS: @@ -330,6 +436,9 @@ static void aspeed_2700_intc0_write(void *opaque, hwaddr offset, uint64_t data, case R_INTC0_GICINT136_STATUS: aspeed_2700_intc_status_handler(s, addr, data); break; + case R_INTC0_GICINT192_201_STATUS: + aspeed_2700_intc_status_handler_multi_outpins(s, addr, data); + break; default: s->regs[addr] = data; break; @@ -441,8 +550,8 @@ static void aspeed_2700_intc0_class_init(ObjectClass *klass, void *data) dc->desc = "ASPEED 2700 INTC 0 Controller"; aic->num_lines = 32; - aic->num_inpins = 9; - aic->num_outpins = 9; + aic->num_inpins = 10; + aic->num_outpins = 19; aic->reg_ops = &aspeed_2700_intc0_ops; aic->mem_size = 0x4000; aic->reg_size = 0x2000; diff --git a/hw/intc/trace-events b/hw/intc/trace-events index af9703e1b5..bcea3bf1d3 100644 --- a/hw/intc/trace-events +++ b/hw/intc/trace-events @@ -92,6 +92,7 @@ aspeed_intc_enable(uint32_t value) "Enable: 0x%x" aspeed_intc_select(uint32_t value) "Select: 0x%x" aspeed_intc_mask(uint32_t change, uint32_t value) "Mask: 0x%x: 0x%x" aspeed_intc_unmask(uint32_t change, uint32_t value) "UnMask: 0x%x: 0x%x" +aspeed_intc_all_isr_done_bit(int inpin_idx, int bit) "All source ISR execution are done from specific bit: %d-%d" # arm_gic.c gic_enable_irq(int irq) "irq %d enabled" diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h index 73261037ea..9280dc49d0 100644 --- a/include/hw/intc/aspeed_intc.h +++ b/include/hw/intc/aspeed_intc.h @@ -17,8 +17,8 @@ OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC) #define ASPEED_INTC_NR_REGS (0x2000 >> 2) -#define ASPEED_INTC_MAX_INPINS 9 -#define ASPEED_INTC_MAX_OUTPINS 9 +#define ASPEED_INTC_MAX_INPINS 10 +#define ASPEED_INTC_MAX_OUTPINS 19 typedef struct AspeedINTCIRQ { int inpin_idx;