Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6988e0e0 authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner
Browse files

genirq/msi: Limit level-triggered MSI to platform devices 



Nobody would be insane enough to try and use level triggered
MSIs on PCI, but let's make sure it doesn't happen. Also,
let's mandate that the irqchip backing the platform MSI domain
is providing the IRQCHIP_SUPPORTS_LEVEL_MSI flag.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Rob Herring <robh@kernel.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lkml.kernel.org/r/20180508121438.11301-3-marc.zyngier@arm.com
parent 0be8153c

drivers/base/platform-msi.c

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ static void platform_msi_update_chip_ops(struct msi_domain_info *info) 
		chip->irq_set_affinity = msi_domain_set_affinity;

	if (!chip->irq_write_msi_msg)

		chip->irq_write_msi_msg = platform_msi_write_msg;

	if (WARN_ON((info->flags & MSI_FLAG_LEVEL_CAPABLE) &&

		    !(chip->flags & IRQCHIP_SUPPORTS_LEVEL_MSI)))

		info->flags &= ~MSI_FLAG_LEVEL_CAPABLE;

}



static void platform_msi_free_descs(struct device *dev, int base, int nvec)

drivers/bus/fsl-mc/fsl-mc-msi.c

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode, 
{

	struct irq_domain *domain;



	if (WARN_ON((info->flags & MSI_FLAG_LEVEL_CAPABLE)))

		info->flags &= ~MSI_FLAG_LEVEL_CAPABLE;

	if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS)

		fsl_mc_msi_update_dom_ops(info);

	if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS)

drivers/pci/msi.c

+3 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,9 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode, 
{

	struct irq_domain *domain;



	if (WARN_ON(info->flags & MSI_FLAG_LEVEL_CAPABLE))

		info->flags &= ~MSI_FLAG_LEVEL_CAPABLE;



	if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS)

		pci_msi_domain_update_dom_ops(info);

	if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS)

include/linux/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ enum { 
	IRQCHIP_SKIP_SET_WAKE		= (1 <<  4),

	IRQCHIP_ONESHOT_SAFE		= (1 <<  5),

	IRQCHIP_EOI_THREADED		= (1 <<  6),

	IRQCHIP_SUPPORTS_LEVEL_MSI	= (1 <<  7),

};



#include <linux/irqdesc.h>