From patchwork Thu Sep 28 06:12:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 13401983 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 34E61CE7AF8 for ; Thu, 28 Sep 2023 06:13:49 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LZHNbc0xUk3j3lkwo2ltnLI/B5nd7tK1EJuJUfuHSI8=; b=s6cPho1yyZKJCu goJth6RNmw3nAY2W5xlo3UYGcyQpRQTXIfbglDeZsjmFKY1BeX0xRIvRmtR3b1jFxflxltMzmOi5L M6vho9fCVPk2Hrs3tnvGRuLI5C75gqOxycpWPDzLmxa9B4MCrngK4i8Agi5xt54/k7B/Y5JK+3P6t TMerzmL/gAw7U+BCSP1ifhT1GRpbcXoezDUavHgt7C+f4oh99nBlektPmAG0dhe45j2dqzHqJBx20 RT9+n2NkO2nxc03xbdQzZLZx8/2lp8/gFitt0qOJh9tQIMlDVPc6jby4/0Exis2m6QLsGv+TDU2np HCC1Q/mmAiU113n8/LWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qlkHP-002M7Y-1d; Thu, 28 Sep 2023 06:13:43 +0000 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qlkHL-002M4Y-2r for linux-riscv@lists.infradead.org; Thu, 28 Sep 2023 06:13:42 +0000 Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-351365e47f6so27557345ab.1 for ; Wed, 27 Sep 2023 23:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1695881618; x=1696486418; darn=lists.infradead.org; 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=JoIL0Jbseu5eDdAqizehsVqw8hc2kpCMN0j94MZf3VE=; b=g2AbA7kLkrD8rneksQzlcSviRmYrkYXepKPJu3QUECFS7BBSpQfJffqU1rnaohXkq5 j1vjGYsfCrPT0Pa2IftKDRuKI0fHOM7w1cb4iqc7HLj9PMo+noVB8Zp94Zd65UGXcjjK yNGaDai4fbDwIjMZoz1PcX1PI4k7m4UvulE4esVQ3KALWkVygC/P6s4+8yF9F2+7wYvk lHAu6mGjZJ5BRUM79CZowffQX5WZx8QKXG3hCbxWq+iC53FbFBB3byO8WfDwa/EtOrSn NAFi/O+PEyYN37lGZq31OcVQpdFi8YNAP+D4EXflw2H2MtPtHfOPHSP7O/Tdh8DB131d jNJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695881618; x=1696486418; 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=JoIL0Jbseu5eDdAqizehsVqw8hc2kpCMN0j94MZf3VE=; b=QHrHH77nnW4SS0l+Xqq6vDPuUebAhH/M469PpO/Hzv1pafR46CAXQrI/+0bStQ1cXY Es33hcZVPv89Le1lKvYZtbrAl/BEJAxCU5mN+zI+4TlNBNffpEGugfZzyALL2r4609Cf +sOPXpAjTIf8oqAJJYUnUNkeMueKRSb8ZVlsgL70yaoLcZT6p3bq6hcreliW3B+2w3cw taRspRY1zQufFr1NWn8oz+R66vRrhQTv3kJ8wxwB7l/o/S1f1Kbom/NihQzDkHX6p/17 vS3VR7Gmdoxr1YWfO6EdL8KQbzjm/Y7OvUEaA3PXxwzW4IxA9InGvqEbhoZySOGNFv2K ZUGQ== X-Gm-Message-State: AOJu0Ywzbv/ZVcK31Xh6hzTj4jpeaifk1sGjImt8tfpfpgFChsLOkd9q SuffEeojbMFei7nSfMRHQ6qrbw== X-Google-Smtp-Source: AGHT+IGdD6X9RPc5QmfMm/xZzpNZ7869FVoao2wFVWLH0UL/EtMhXXLxISL14XYAdn3sOjv4dptsfg== X-Received: by 2002:a05:6e02:2148:b0:348:ba80:5a37 with SMTP id d8-20020a056e02214800b00348ba805a37mr396167ilv.0.1695881618314; Wed, 27 Sep 2023 23:13:38 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.165.210]) by smtp.gmail.com with ESMTPSA id x6-20020a92d306000000b003506f457d70sm4774467ila.63.2023.09.27.23.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 23:13:37 -0700 (PDT) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Thomas Gleixner , Marc Zyngier , Rob Herring , Krzysztof Kozlowski , Frank Rowand , Conor Dooley Subject: [PATCH v9 10/15] irqchip/riscv-imsic: Add support for PCI MSI irqdomain Date: Thu, 28 Sep 2023 11:42:02 +0530 Message-Id: <20230928061207.1841513-11-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230928061207.1841513-1-apatel@ventanamicro.com> References: <20230928061207.1841513-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_231339_933121_37C2D8C4 X-CRM114-Status: GOOD ( 17.62 ) 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: , Cc: Anup Patel , devicetree@vger.kernel.org, Saravana Kannan , Anup Patel , linux-kernel@vger.kernel.org, Atish Patra , linux-riscv@lists.infradead.org, Andrew Jones Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The Linux PCI framework requires it's own dedicated MSI irqdomain so let us create PCI MSI irqdomain as child of the IMSIC base irqdomain. Signed-off-by: Anup Patel --- drivers/irqchip/Kconfig | 7 ++++ drivers/irqchip/irq-riscv-imsic-platform.c | 48 ++++++++++++++++++++++ drivers/irqchip/irq-riscv-imsic-state.h | 1 + 3 files changed, 56 insertions(+) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index bdd80716114d..c1d69b418dfb 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -552,6 +552,13 @@ config RISCV_IMSIC select IRQ_DOMAIN_HIERARCHY select GENERIC_MSI_IRQ +config RISCV_IMSIC_PCI + bool + depends on RISCV_IMSIC + depends on PCI + depends on PCI_MSI + default RISCV_IMSIC + config EXYNOS_IRQ_COMBINER bool "Samsung Exynos IRQ combiner support" if COMPILE_TEST depends on (ARCH_EXYNOS && ARM) || COMPILE_TEST diff --git a/drivers/irqchip/irq-riscv-imsic-platform.c b/drivers/irqchip/irq-riscv-imsic-platform.c index b78f1b2ee3dc..ff737b4e195f 100644 --- a/drivers/irqchip/irq-riscv-imsic-platform.c +++ b/drivers/irqchip/irq-riscv-imsic-platform.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -184,6 +185,39 @@ static const struct irq_domain_ops imsic_base_domain_ops = { .free = imsic_irq_domain_free, }; +#ifdef CONFIG_RISCV_IMSIC_PCI + +static void imsic_pci_mask_irq(struct irq_data *d) +{ + pci_msi_mask_irq(d); + irq_chip_mask_parent(d); +} + +static void imsic_pci_unmask_irq(struct irq_data *d) +{ + pci_msi_unmask_irq(d); + irq_chip_unmask_parent(d); +} + +static struct irq_chip imsic_pci_irq_chip = { + .name = "IMSIC-PCI", + .irq_mask = imsic_pci_mask_irq, + .irq_unmask = imsic_pci_unmask_irq, + .irq_eoi = irq_chip_eoi_parent, +}; + +static struct msi_domain_ops imsic_pci_domain_ops = { +}; + +static struct msi_domain_info imsic_pci_domain_info = { + .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | + MSI_FLAG_PCI_MSIX | MSI_FLAG_MULTI_PCI_MSI), + .ops = &imsic_pci_domain_ops, + .chip = &imsic_pci_irq_chip, +}; + +#endif + static struct irq_chip imsic_plat_irq_chip = { .name = "IMSIC-PLAT", }; @@ -208,12 +242,26 @@ static int imsic_irq_domains_init(struct device *dev) } irq_domain_update_bus_token(imsic->base_domain, DOMAIN_BUS_NEXUS); +#ifdef CONFIG_RISCV_IMSIC_PCI + /* Create PCI MSI domain */ + imsic->pci_domain = pci_msi_create_irq_domain(dev->fwnode, + &imsic_pci_domain_info, + imsic->base_domain); + if (!imsic->pci_domain) { + dev_err(dev, "failed to create IMSIC PCI domain\n"); + irq_domain_remove(imsic->base_domain); + return -ENOMEM; + } +#endif + /* Create Platform MSI domain */ imsic->plat_domain = platform_msi_create_irq_domain(dev->fwnode, &imsic_plat_domain_info, imsic->base_domain); if (!imsic->plat_domain) { dev_err(dev, "failed to create IMSIC platform domain\n"); + if (imsic->pci_domain) + irq_domain_remove(imsic->pci_domain); irq_domain_remove(imsic->base_domain); return -ENOMEM; } diff --git a/drivers/irqchip/irq-riscv-imsic-state.h b/drivers/irqchip/irq-riscv-imsic-state.h index 3170018949a8..ff3c377b9b33 100644 --- a/drivers/irqchip/irq-riscv-imsic-state.h +++ b/drivers/irqchip/irq-riscv-imsic-state.h @@ -31,6 +31,7 @@ struct imsic_priv { /* IRQ domains (created by platform driver) */ struct irq_domain *base_domain; + struct irq_domain *pci_domain; struct irq_domain *plat_domain; };