aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2014-11-06 09:20:17 -0500
committerThomas Gleixner <tglx@linutronix.de>2014-11-23 07:01:46 -0500
commit515085ef7ee74694bc9b02bc45196452defad59a (patch)
treee72aeb0216fcdcd1e91b26a4dacd118ee6b6a0c9
parent56e8abab615e0c5858cfb9fa0015a44641762b9d (diff)
genirq: Introduce irq_chip.irq_compose_msi_msg() to support stacked irqchip
Add callback irq_compose_msi_msg to struct irq_chip, which will be used to support stacked irqchip. Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Grant Likely <grant.likely@linaro.org> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Yingjoe Chen <yingjoe.chen@mediatek.com> Cc: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/linux/irq.h5
-rw-r--r--kernel/irq/chip.c26
2 files changed, 31 insertions, 0 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index fad4bf6f15f6..d58e58935465 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -29,6 +29,7 @@ struct seq_file;
29struct module; 29struct module;
30struct irq_desc; 30struct irq_desc;
31struct irq_data; 31struct irq_data;
32struct msi_msg;
32typedef void (*irq_flow_handler_t)(unsigned int irq, 33typedef void (*irq_flow_handler_t)(unsigned int irq,
33 struct irq_desc *desc); 34 struct irq_desc *desc);
34typedef void (*irq_preflow_handler_t)(struct irq_data *data); 35typedef void (*irq_preflow_handler_t)(struct irq_data *data);
@@ -320,6 +321,7 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
320 * any other callback related to this irq 321 * any other callback related to this irq
321 * @irq_release_resources: optional to release resources acquired with 322 * @irq_release_resources: optional to release resources acquired with
322 * irq_request_resources 323 * irq_request_resources
324 * @irq_compose_msi_msg: optional to compose message content for MSI
323 * @flags: chip specific flags 325 * @flags: chip specific flags
324 */ 326 */
325struct irq_chip { 327struct irq_chip {
@@ -356,6 +358,8 @@ struct irq_chip {
356 int (*irq_request_resources)(struct irq_data *data); 358 int (*irq_request_resources)(struct irq_data *data);
357 void (*irq_release_resources)(struct irq_data *data); 359 void (*irq_release_resources)(struct irq_data *data);
358 360
361 void (*irq_compose_msi_msg)(struct irq_data *data, struct msi_msg *msg);
362
359 unsigned long flags; 363 unsigned long flags;
360}; 364};
361 365
@@ -443,6 +447,7 @@ extern void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc);
443extern void handle_bad_irq(unsigned int irq, struct irq_desc *desc); 447extern void handle_bad_irq(unsigned int irq, struct irq_desc *desc);
444extern void handle_nested_irq(unsigned int irq); 448extern void handle_nested_irq(unsigned int irq);
445 449
450extern int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg);
446#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY 451#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
447extern void irq_chip_ack_parent(struct irq_data *data); 452extern void irq_chip_ack_parent(struct irq_data *data);
448extern int irq_chip_retrigger_hierarchy(struct irq_data *data); 453extern int irq_chip_retrigger_hierarchy(struct irq_data *data);
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 47f4c6469a43..63c16d165e78 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -926,3 +926,29 @@ int irq_chip_retrigger_hierarchy(struct irq_data *data)
926 return -ENOSYS; 926 return -ENOSYS;
927} 927}
928#endif 928#endif
929
930/**
931 * irq_chip_compose_msi_msg - Componse msi message for a irq chip
932 * @data: Pointer to interrupt specific data
933 * @msg: Pointer to the MSI message
934 *
935 * For hierarchical domains we find the first chip in the hierarchy
936 * which implements the irq_compose_msi_msg callback. For non
937 * hierarchical we use the top level chip.
938 */
939int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
940{
941 struct irq_data *pos = NULL;
942
943#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
944 for (; data; data = data->parent_data)
945#endif
946 if (data->chip && data->chip->irq_compose_msi_msg)
947 pos = data;
948 if (!pos)
949 return -ENOSYS;
950
951 pos->chip->irq_compose_msi_msg(pos, msg);
952
953 return 0;
954}