: Change msi to support the Mbigen interrupt

PATCH Superseded majun (F) 2 participants 2 messages May 30, 2015 – Jun 1, 2015

Subsystems (2)

IRQ IRQ domains (IRQ number mapping library)

lore

Share & tools

lore

majun (F)

author

2015-05-30 03:19 UTC #0 lore raw

PATCH 2/4 : Change msi to support the Mbigen interrupt

This patch is applied to support the interrupts from Mbigen.

As a interrupt controller, Mbigen is used as a child domain of MSI domain just like pci device.

Change log:
--add IRQ_DOMAIN_FLAG_MBIGEN to presents the interrupt from mbigen --add function is_mbigen_domain to check the interrupt domain --modified irq_chip_write_msi_msg to use the different message write function
for interrupt from mbigen

Signed-off-by Ma Jun <[email protected]>

---
 include/linux/irqdomain.h |    2 +-
 include/linux/msi.h       |    1 +
 kernel/irq/msi.c          |   22 +++++++++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 include/linux/msi.h
 mode change 100644 => 100755 kernel/irq/msi.c

include/linux/irqdomain.h +1 -1

index 676d730..cb6b33a 100644
@@ -136,7 +136,7 @@ enum {
 
 	/* Core calls alloc/free recursive through the domain hierarchy. */
 	IRQ_DOMAIN_FLAG_AUTO_RECURSIVE	= (1 << 1),
-
+	IRQ_DOMAIN_FLAG_MBIGEN = (1 << 2),
 	/*
 	 * Flags starting from IRQ_DOMAIN_FLAG_NONCORE are reserved
 	 * for implementation specific purposes and ignored by the

include/linux/msi.h +1 -0

old mode 100644
new mode 100755
index 8ac4a68..3e2b6c7
@@ -239,5 +239,6 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev,
 int pci_msi_domain_check_cap(struct irq_domain *domain,
 			     struct msi_domain_info *info, struct device *dev);
 #endif /* CONFIG_PCI_MSI_IRQ_DOMAIN */
+bool is_mbigen_domain(struct irq_data *data);
 
 #endif /* LINUX_MSI_H */

kernel/irq/msi.c +21 -1

old mode 100644
new mode 100755
index 474de5c..1dba07e
@@ -31,11 +31,31 @@ void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg)
 }
 EXPORT_SYMBOL_GPL(get_cached_msi_msg);
 
+bool is_mbigen_domain(struct irq_data *data)
+{
+	int virq;
+	struct irq_domain *domain;
+	struct irq_data *source_irq_data;
+
+	virq = data->irq;
+	source_irq_data = irq_get_irq_data(virq);
+	domain = source_irq_data->domain;
+
+	if (domain->flags & IRQ_DOMAIN_FLAG_MBIGEN)
+		return true;
+	else
+		return false;
+
+}
+
 #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
 static inline void irq_chip_write_msi_msg(struct irq_data *data,
 					  struct msi_msg *msg)
 {
-	data->chip->irq_write_msi_msg(data, msg);
+	if (is_mbigen_domain(data))
+		data->chip->irq_write_mbi_msg(data, msg);
+	else
+		data->chip->irq_write_msi_msg(data, msg);
 }
 
 /**

Signature · 1 line

1.7.1

Marc Zyngier

2015-06-01 08:55 UTC #1 lore raw

Quoted 76 lines · majun (F)

This patch is applied to support the interrupts from Mbigen.

As a interrupt controller, Mbigen is used as a child domain of MSI domain just like pci device.

Signed-off-by Ma Jun <[email protected]>

---
 include/linux/irqdomain.h |    2 +-
 include/linux/msi.h       |    1 +
 kernel/irq/msi.c          |   22 +++++++++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 include/linux/msi.h
 mode change 100644 => 100755 kernel/irq/msi.c

include/linux/irqdomain.h +1 -1

index 676d730..cb6b33a 100644
@@ -136,7 +136,7 @@ enum {
 
 	/* Core calls alloc/free recursive through the domain hierarchy. */
 	IRQ_DOMAIN_FLAG_AUTO_RECURSIVE	= (1 << 1),
-
+	IRQ_DOMAIN_FLAG_MBIGEN = (1 << 2),
 	/*
 	 * Flags starting from IRQ_DOMAIN_FLAG_NONCORE are reserved
 	 * for implementation specific purposes and ignored by the

include/linux/msi.h +1 -0

old mode 100644
new mode 100755
index 8ac4a68..3e2b6c7
@@ -239,5 +239,6 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev,
 int pci_msi_domain_check_cap(struct irq_domain *domain,
 			     struct msi_domain_info *info, struct device *dev);
 #endif /* CONFIG_PCI_MSI_IRQ_DOMAIN */
+bool is_mbigen_domain(struct irq_data *data);
 
 #endif /* LINUX_MSI_H */

kernel/irq/msi.c +17 -0

old mode 100644
new mode 100755
index 474de5c..1dba07e
@@ -31,11 +31,31 @@ void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg)
 }
 EXPORT_SYMBOL_GPL(get_cached_msi_msg);
 
+bool is_mbigen_domain(struct irq_data *data)
+{
+	int virq;
+	struct irq_domain *domain;
+	struct irq_data *source_irq_data;
+
+	virq = data->irq;
+	source_irq_data = irq_get_irq_data(virq);
+	domain = source_irq_data->domain;
+
+	if (domain->flags & IRQ_DOMAIN_FLAG_MBIGEN)
+		return true;
+	else
+		return false;
+
+}
+
 #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
 static inline void irq_chip_write_msi_msg(struct irq_data *data,

kernel/irq/msi.c void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg) · line 61

Quoted 10 lines

kernel/irq/msi.c +4 -1

 					  struct msi_msg *msg)
 {
-	data->chip->irq_write_msi_msg(data, msg);
+	if (is_mbigen_domain(data))
+		data->chip->irq_write_mbi_msg(data, msg);
+	else
+		data->chip->irq_write_msi_msg(data, msg);
 }
 
 /**

This is exactly why I dislike your approach. You start inventing weird and wonderful callbacks that serve no real purpose. What is wrong with the existing callback? you are passing the same times to it...

M.

Signature · 1 line

Jazz is not dead. It just smells funny...