From patchwork Mon Feb 26 04:07:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 13571286 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 A1E93C5478C for ; Mon, 26 Feb 2024 04:10:21 +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=IErKfdUmnm2EkUPmVfHFivflgJRQiOItr1VlT3ouM9w=; b=lYUIeW2qdSwHWj kwrFVa+yBws6NTewuG/hxbcGx5uLCVNUH6wsXWd14O5lcoXp5LdemF74zNYfrPTl4acg9Vum/Z7II x0mbFRAO7JaNeLFADBBLYLXGcPcIkg4grwVp8pWcBb/cdLSloPc1IP20wN77G9k3O+Z93uzkamwFE C7lHNhxLEIz2yegJM6CPkhyeXihEGbXW9X58igLYkBzu4z7L7VPlXNHwhF7JDsFbw8bZRur6v6nhC pKJyiHXpd4FFsA4ctjAsr+qH3OqBcJhcxuFzXP2bfJgL8ch5YODIhETVKvuEMRNWUbbOGF7/bOdDz 8fk2fY3lW2q5eW1WYRYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1reSJb-0000000GNzG-3RMN; Mon, 26 Feb 2024 04:10:07 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1reSJ0-0000000GNVB-1WS1 for linux-arm-kernel@lists.infradead.org; Mon, 26 Feb 2024 04:09:35 +0000 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1dc29f1956cso16114195ad.0 for ; Sun, 25 Feb 2024 20:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1708920568; x=1709525368; 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=7jRh4tMvuYcqr95qV4EQU7BolCnIgD6A0sDxFfSdHTU=; b=SCbhHYAh0PB5vY8gCcdNEA7qKajY7Pz5rqcAUtxWmIqISdYFJPA8QIT94H8iYsCyer PL1HCVsHDgiakLOsb78i25Nl+JWUdpxbJjoIrkVRzeIlVVPq1oZHXh/OdiFQ0AwN/FdX RHMzzKl7LXvc0N9dN4d8g2Gy9YxmnwEutz5IwuCzT09w73wBNz/XA8GayF76AGYglrQH BHU7uwp4wifbZRQ6ItDzVy8TadJzO7xD/l4+DnxTn2Gl50bTOjIwQPXWtMTy7ILXxJY+ q7ux1ZP3AXn7rUV2PPbUPdKpyDRN7qQL7GfRms1GZsIRkSiUZjyCH+UJwXv54HD0NYoz H7uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708920568; x=1709525368; 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=7jRh4tMvuYcqr95qV4EQU7BolCnIgD6A0sDxFfSdHTU=; b=CRE1WRboT07AN4QWEYhriciTlUHyTqfQuiLFV/V/5PDtZ1T+pvEwUCjrGwaXt1rI1A 6bLBhbcCOXr5K8GAG0MzLVM/dOgmsiBHhxzwgknrDpdjOWmFufNZ2YS560l0lYizKQRC kkq5AMvQ4iuBayFz9xP1kL8r1XTRBBkXfnB75elOyC2hND4GxJAeNg1LhlccQRw/+mT2 AAdop4reYZzOaqy3uzMk/v3ut6/apvV69p2Mrxrh3fx1I8SXC9/edtFpiz24S1ink7MI 2dNSalC77oXujsHqbNqT/EEE3LC90Y2FwvqsOi8fJHCBgF/0iNJRELbD5siGdVR4tNDK tURQ== X-Forwarded-Encrypted: i=1; AJvYcCUCsU3glM51Ih7hBry+SthqfalKtVY7NgwM/KzvMjmi9fzYyOs2lWfiePHCkWyr+P9rVXXKPXMtCGY8Xf2sv3menRSLN+GoXqcgQ+N9yXjrgZwIk48= X-Gm-Message-State: AOJu0YyMdFF2qiA/FMS9oQpv9WhsMmARMlTcWtlZRTftsdm2U8uLtW23 fvBVgMm7iMbo9+J89UiDDiG7IeacneUoW14dAwuJ6zuAQxQRllR9d/Dz/hZ0eOU= X-Google-Smtp-Source: AGHT+IFb5nfTnsngif5R24W+zDTwXCsdIbt9IxWe6Et50phyVLUhDui9STPSBvBSVJnrNYZYK5nNgQ== X-Received: by 2002:a17:902:e885:b0:1dc:a84c:987c with SMTP id w5-20020a170902e88500b001dca84c987cmr626941plg.10.1708920568219; Sun, 25 Feb 2024 20:09:28 -0800 (PST) Received: from localhost.localdomain ([171.76.86.62]) by smtp.gmail.com with ESMTPSA id d11-20020a170902654b00b001dc6f7e794dsm3023258pln.16.2024.02.25.20.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 20:09:27 -0800 (PST) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Thomas Gleixner , Rob Herring , Krzysztof Kozlowski , Frank Rowand , Conor Dooley Cc: Marc Zyngier , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Atish Patra , Andrew Jones , Sunil V L , Saravana Kannan , Anup Patel , linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Anup Patel Subject: [PATCH v15 05/10] irqchip/riscv-imsic: Add device MSI domain support for PCI devices Date: Mon, 26 Feb 2024 09:37:41 +0530 Message-Id: <20240226040746.1396416-6-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240226040746.1396416-1-apatel@ventanamicro.com> References: <20240226040746.1396416-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240225_200930_640091_0FC11693 X-CRM114-Status: GOOD ( 16.58 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Linux PCI framework supports per-device MSI domains for PCI devices so extend the IMSIC driver to allow PCI per-device MSI domains. Signed-off-by: Anup Patel --- drivers/irqchip/Kconfig | 7 +++++ drivers/irqchip/irq-riscv-imsic-platform.c | 35 ++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 85f86e31c996..2fc0cb32341a 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -553,6 +553,13 @@ config RISCV_IMSIC select GENERIC_IRQ_MATRIX_ALLOCATOR 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 35291bf90d65..1e6dddfd3046 100644 --- a/drivers/irqchip/irq-riscv-imsic-platform.c +++ b/drivers/irqchip/irq-riscv-imsic-platform.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -207,6 +208,28 @@ static const struct irq_domain_ops imsic_base_domain_ops = { #endif }; +#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) +{ + irq_chip_unmask_parent(d); + pci_msi_unmask_irq(d); +} + +#define MATCH_PCI_MSI BIT(DOMAIN_BUS_PCI_MSI) + +#else + +#define MATCH_PCI_MSI 0 + +#endif + static bool imsic_init_dev_msi_info(struct device *dev, struct irq_domain *domain, struct irq_domain *real_parent, @@ -230,6 +253,13 @@ static bool imsic_init_dev_msi_info(struct device *dev, /* Is the target supported? */ switch (info->bus_token) { +#ifdef CONFIG_RISCV_IMSIC_PCI + case DOMAIN_BUS_PCI_DEVICE_MSI: + case DOMAIN_BUS_PCI_DEVICE_MSIX: + info->chip->irq_mask = imsic_pci_mask_irq; + info->chip->irq_unmask = imsic_pci_unmask_irq; + break; +#endif case DOMAIN_BUS_DEVICE_MSI: /* * Per-device MSI should never have any MSI feature bits @@ -269,11 +299,12 @@ static bool imsic_init_dev_msi_info(struct device *dev, #define MATCH_PLATFORM_MSI BIT(DOMAIN_BUS_PLATFORM_MSI) static const struct msi_parent_ops imsic_msi_parent_ops = { - .supported_flags = MSI_GENERIC_FLAGS_MASK, + .supported_flags = MSI_GENERIC_FLAGS_MASK | + MSI_FLAG_PCI_MSIX, .required_flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS, .bus_select_token = DOMAIN_BUS_NEXUS, - .bus_select_mask = MATCH_PLATFORM_MSI, + .bus_select_mask = MATCH_PCI_MSI | MATCH_PLATFORM_MSI, .init_dev_msi_info = imsic_init_dev_msi_info, };