diff mbox series

[v13,08/13] irqchip/riscv-imsic: Add device MSI domain support for PCI devices

Message ID 20240220060718.823229-9-apatel@ventanamicro.com
State New
Headers
Series Linux RISC-V AIA Support |

Commit Message

Anup Patel Feb. 20, 2024, 6:07 a.m. UTC 
  The Linux PCI framework supports per-device MSI domains for PCI devices
so let us extend the IMSIC driver to allow per-device MSI domains for
PCI devices.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
---
 drivers/irqchip/Kconfig                    |  7 +++++
 drivers/irqchip/irq-riscv-imsic-platform.c | 36 ++++++++++++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

Comments

Thomas Gleixner Feb. 20, 2024, 1:35 p.m. UTC | #1 
On Tue, Feb 20 2024 at 11:37, Anup Patel wrote:
>  static bool imsic_init_dev_msi_info(struct device *dev,
>  				    struct irq_domain *domain,
>  				    struct irq_domain *real_parent,
> @@ -218,6 +241,7 @@ static bool imsic_init_dev_msi_info(struct device *dev,
>  
>  	/* MSI parent domain specific settings */
>  	switch (real_parent->bus_token) {
> +	case DOMAIN_BUS_PCI_MSI:

	case DOMAIN_BUS_PCI_DEVICE_MSIX:

?

Thanks,

        tglx
Anup Patel Feb. 20, 2024, 5:21 p.m. UTC | #2 
On Tue, Feb 20, 2024 at 7:05 PM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Tue, Feb 20 2024 at 11:37, Anup Patel wrote:
> >  static bool imsic_init_dev_msi_info(struct device *dev,
> >                                   struct irq_domain *domain,
> >                                   struct irq_domain *real_parent,
> > @@ -218,6 +241,7 @@ static bool imsic_init_dev_msi_info(struct device *dev,
> >
> >       /* MSI parent domain specific settings */
> >       switch (real_parent->bus_token) {
> > +     case DOMAIN_BUS_PCI_MSI:
>
>         case DOMAIN_BUS_PCI_DEVICE_MSIX:
>
> ?

Actually, the DOMAIN_BUS_PCI_MSI is not needed because
the real parent domain is always the IMSIC base irq_domain
so DOMAIN_BUS_NEXUS is sufficient.

Better to just drop DOMAIN_BUS_PCI_MSI from this switch case ?

Regards,
Anup
Thomas Gleixner Feb. 20, 2024, 8:03 p.m. UTC | #3 
On Tue, Feb 20 2024 at 22:51, Anup Patel wrote:

> On Tue, Feb 20, 2024 at 7:05 PM Thomas Gleixner <tglx@linutronix.de> wrote:
>>
>> On Tue, Feb 20 2024 at 11:37, Anup Patel wrote:
>> >  static bool imsic_init_dev_msi_info(struct device *dev,
>> >                                   struct irq_domain *domain,
>> >                                   struct irq_domain *real_parent,
>> > @@ -218,6 +241,7 @@ static bool imsic_init_dev_msi_info(struct device *dev,
>> >
>> >       /* MSI parent domain specific settings */
>> >       switch (real_parent->bus_token) {
>> > +     case DOMAIN_BUS_PCI_MSI:
>>
>>         case DOMAIN_BUS_PCI_DEVICE_MSIX:
>>
>> ?
>
> Actually, the DOMAIN_BUS_PCI_MSI is not needed because
> the real parent domain is always the IMSIC base irq_domain
> so DOMAIN_BUS_NEXUS is sufficient.

Indeed. Obviously I can't read.

> Better to just drop DOMAIN_BUS_PCI_MSI from this switch case ?

Yes. I actually would be a bug if that ends up as the real parent
domain.

Thanks,

       tglx
diff mbox series

Patch

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 7ee44c493dbc..37f47375d5b7 100644
--- a/drivers/irqchip/irq-riscv-imsic-platform.c
+++ b/drivers/irqchip/irq-riscv-imsic-platform.c
@@ -14,6 +14,7 @@ 
 #include <linux/irqdomain.h>
 #include <linux/module.h>
 #include <linux/msi.h>
+#include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/smp.h>
@@ -209,6 +210,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,
@@ -218,6 +241,7 @@  static bool imsic_init_dev_msi_info(struct device *dev,
 
 	/* MSI parent domain specific settings */
 	switch (real_parent->bus_token) {
+	case DOMAIN_BUS_PCI_MSI:
 	case DOMAIN_BUS_NEXUS:
 		if (WARN_ON_ONCE(domain != real_parent))
 			return false;
@@ -232,6 +256,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
@@ -271,11 +302,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,
 };