From patchwork Mon May 8 14:28:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 13234628 X-Patchwork-Delegate: palmer@dabbelt.com 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E4B7CC7EE22 for ; Mon, 8 May 2023 14:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=soQe+8wXvupTLGAtqL3l3m43Ycdg5gYa+oxa/nMKi9E=; b=AuJEdYedyp9ZIv zBmKfUAOdnmy0PrYxwXrLgJEdQeWfir8pKjiNGBYqT7UQ8sa5WbQbznGvXR8/UkE4qQ5cgE+U99rI 5FAppGZ9m55P77kHokspcldBQTYNBLdYxJKbhGg+K51tdMlCYaGlI5EmQnydUqe2swS1BHsIh2Htl 0fzSYqmzpcRP2d97P3acfczQUzd4JrGUQH4mNW3vas9knM049daAkZyF0e/J3EtSdGZeHqWGRiPl3 J83j/GsyMgTkiAi/OFn75v1lvxhnWttEiBiaDQ/bGlSFrYWkmOzcC0xLAe7bu/X1qegpMjG7QhItJ fui0Q46Fuess5UQaCWcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pw1rb-000kVz-1W; Mon, 08 May 2023 14:29:19 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pw1rZ-000kTj-1D for linux-riscv@lists.infradead.org; Mon, 08 May 2023 14:29:18 +0000 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6434e65d808so4888030b3a.3 for ; Mon, 08 May 2023 07:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1683556154; x=1686148154; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XXSsvlQ/R6yHM0Hz/nbqBTRJ+migXFNIKunDjIZh+EE=; b=DweqYW/wrp2Hf6/tVp5eeVH4LnisiW9pU5JubLDyr0brsc0HBnW8Qgyr1eFnd5QfXK 8w4qBpjYMQah6H1nRgtuXFq59MELnCpNXOFOdjeszMPCrkyVCInlZgzLC1Jq6h3U0gzj 1U+VyQRCz1W2lHAYuK9sV/KyTfdpUh/o4R/Umu35gl0DHT+wQ5xhgCQf4yCT+UgnO877 5JzFxsXO14oRxKst0J6FSwH4DF1anEFXBqoEEqBt3Mjr3dS/UbPv59e+DaQhVgNeZPfw JyGEa7GHoWYIj/EDesISBqmzze/6QFm98thoAnFGsp2XFWF2ezTT8bdnc7chD2cr595N FHhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683556154; x=1686148154; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XXSsvlQ/R6yHM0Hz/nbqBTRJ+migXFNIKunDjIZh+EE=; b=HpD+xY2T1CZ454RW52Tx16ooeo+AM2DjA/h2nEWNN4hxR03k+l+UWheaQK1dfI3zXX sM7dCmLPwYCr3E0Y+7cPnPlEcqTUHXgByII3FFGaqQt/X9rhyKb6GdBaRytbb399XdPn 5dVHpEU/tzN6Tqmv3WnPx4wwT1fCLAoxP4CJRgnkSdwgSb9hb/88Yra5EhsfpD7ArVuL p7Bp0Nv0ZnOsraAvgC7zpFQSsnDezTzAbEWpbAkPXeMrHuvesvgWsUxLfBmOvTzDxuzQ CH4NTXFirmVznuwGuh8OdeG6VYm95tidiUmUeJucX5tSQrFf05qjBUHUOaSml/yiiwJU Xiew== X-Gm-Message-State: AC+VfDxnbnaXP3MRIeZS9WSwlIjFyeRWXgTPKof3lWxUm87X/MkhyjMt IbGW8+YIBRfSrjZ1lH2ZFGIGyg== X-Google-Smtp-Source: ACHHUZ6JKmM9VqImZaX2S97BnVWhdOzFaJH4rfqwapMKH0g1mnrTSSPACfAXsGo9FUvbfjhgxbRRvw== X-Received: by 2002:a05:6a00:23c4:b0:63d:254a:3901 with SMTP id g4-20020a056a0023c400b0063d254a3901mr13848595pfc.25.1683556154240; Mon, 08 May 2023 07:29:14 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([171.76.84.206]) by smtp.gmail.com with ESMTPSA id k3-20020aa790c3000000b0063d46ec5777sm6082pfk.158.2023.05.08.07.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 07:29:13 -0700 (PDT) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Thomas Gleixner , Marc Zyngier , Rob Herring , Krzysztof Kozlowski , Robin Murphy , Joerg Roedel , Will Deacon , Frank Rowand Cc: Atish Patra , Andrew Jones , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, iommu@lists.linux.dev, Anup Patel Subject: [PATCH v3 03/11] irqchip/riscv-intc: Add support for RISC-V AIA Date: Mon, 8 May 2023 19:58:34 +0530 Message-Id: <20230508142842.854564-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230508142842.854564-1-apatel@ventanamicro.com> References: <20230508142842.854564-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230508_072917_419987_AB6E8E2E X-CRM114-Status: GOOD ( 15.47 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The RISC-V advanced interrupt architecture (AIA) extends the per-HART local interrupts in following ways: 1. Minimum 64 local interrupts for both RV32 and RV64 2. Ability to process multiple pending local interrupts in same interrupt handler 3. Priority configuration for each local interrupts 4. Special CSRs to configure/access the per-HART MSI controller This patch adds support for RISC-V AIA in the RISC-V intc driver. Signed-off-by: Anup Patel --- drivers/irqchip/irq-riscv-intc.c | 36 ++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c index 4adeee1bc391..e235bf1708a4 100644 --- a/drivers/irqchip/irq-riscv-intc.c +++ b/drivers/irqchip/irq-riscv-intc.c @@ -17,6 +17,7 @@ #include #include #include +#include static struct irq_domain *intc_domain; @@ -30,6 +31,15 @@ static asmlinkage void riscv_intc_irq(struct pt_regs *regs) generic_handle_domain_irq(intc_domain, cause); } +static asmlinkage void riscv_intc_aia_irq(struct pt_regs *regs) +{ + unsigned long topi; + + while ((topi = csr_read(CSR_TOPI))) + generic_handle_domain_irq(intc_domain, + topi >> TOPI_IID_SHIFT); +} + /* * On RISC-V systems local interrupts are masked or unmasked by writing * the SIE (Supervisor Interrupt Enable) CSR. As CSRs can only be written @@ -39,12 +49,18 @@ static asmlinkage void riscv_intc_irq(struct pt_regs *regs) static void riscv_intc_irq_mask(struct irq_data *d) { - csr_clear(CSR_IE, BIT(d->hwirq)); + if (d->hwirq < BITS_PER_LONG) + csr_clear(CSR_IE, BIT(d->hwirq)); + else + csr_clear(CSR_IEH, BIT(d->hwirq - BITS_PER_LONG)); } static void riscv_intc_irq_unmask(struct irq_data *d) { - csr_set(CSR_IE, BIT(d->hwirq)); + if (d->hwirq < BITS_PER_LONG) + csr_set(CSR_IE, BIT(d->hwirq)); + else + csr_set(CSR_IEH, BIT(d->hwirq - BITS_PER_LONG)); } static void riscv_intc_irq_eoi(struct irq_data *d) @@ -115,16 +131,22 @@ static struct fwnode_handle *riscv_intc_hwnode(void) static int __init riscv_intc_init_common(struct fwnode_handle *fn) { - int rc; + int rc, nr_irqs = BITS_PER_LONG; + + if (riscv_isa_extension_available(NULL, SxAIA) && BITS_PER_LONG == 32) + nr_irqs = nr_irqs * 2; - intc_domain = irq_domain_create_linear(fn, BITS_PER_LONG, + intc_domain = irq_domain_create_linear(fn, nr_irqs, &riscv_intc_domain_ops, NULL); if (!intc_domain) { pr_err("unable to add IRQ domain\n"); return -ENXIO; } - rc = set_handle_irq(&riscv_intc_irq); + if (riscv_isa_extension_available(NULL, SxAIA)) + rc = set_handle_irq(&riscv_intc_aia_irq); + else + rc = set_handle_irq(&riscv_intc_irq); if (rc) { pr_err("failed to set irq handler\n"); return rc; @@ -132,7 +154,9 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn) riscv_set_intc_hwnode_fn(riscv_intc_hwnode); - pr_info("%d local interrupts mapped\n", BITS_PER_LONG); + pr_info("%d local interrupts mapped%s\n", + nr_irqs, (riscv_isa_extension_available(NULL, SxAIA)) ? + " using AIA" : ""); return 0; }