Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
irqchip
/
irq-hip04.c
diff --git
a/kernel/drivers/irqchip/irq-hip04.c
b/kernel/drivers/irqchip/irq-hip04.c
index
7d6ffb5
..
9688d2e
100644
(file)
--- a/
kernel/drivers/irqchip/irq-hip04.c
+++ b/
kernel/drivers/irqchip/irq-hip04.c
@@
-41,6
+41,7
@@
#include <linux/irqdomain.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/irqdomain.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
+#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic.h>
#include <asm/irq.h>
#include <linux/irqchip/arm-gic.h>
#include <asm/irq.h>
@@
-48,7
+49,6
@@
#include <asm/smp_plat.h>
#include "irq-gic-common.h"
#include <asm/smp_plat.h>
#include "irq-gic-common.h"
-#include "irqchip.h"
#define HIP04_MAX_IRQS 510
#define HIP04_MAX_IRQS 510
@@
-202,6
+202,9
@@
static struct irq_chip hip04_irq_chip = {
#ifdef CONFIG_SMP
.irq_set_affinity = hip04_irq_set_affinity,
#endif
#ifdef CONFIG_SMP
.irq_set_affinity = hip04_irq_set_affinity,
#endif
+ .flags = IRQCHIP_SET_TYPE_MASKED |
+ IRQCHIP_SKIP_SET_WAKE |
+ IRQCHIP_MASK_ON_SUSPEND,
};
static u16 hip04_get_cpumask(struct hip04_irq_data *intc)
};
static u16 hip04_get_cpumask(struct hip04_irq_data *intc)
@@
-304,11
+307,11
@@
static int hip04_irq_domain_map(struct irq_domain *d, unsigned int irq,
irq_set_percpu_devid(irq);
irq_set_chip_and_handler(irq, &hip04_irq_chip,
handle_percpu_devid_irq);
irq_set_percpu_devid(irq);
irq_set_chip_and_handler(irq, &hip04_irq_chip,
handle_percpu_devid_irq);
-
set_irq_flags(irq, IRQF_VALID | IRQF
_NOAUTOEN);
+
irq_set_status_flags(irq, IRQ
_NOAUTOEN);
} else {
irq_set_chip_and_handler(irq, &hip04_irq_chip,
handle_fasteoi_irq);
} else {
irq_set_chip_and_handler(irq, &hip04_irq_chip,
handle_fasteoi_irq);
-
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE
);
+
irq_set_probe(irq
);
}
irq_set_chip_data(irq, d->host_data);
return 0;
}
irq_set_chip_data(irq, d->host_data);
return 0;
@@
-322,7
+325,7
@@
static int hip04_irq_domain_xlate(struct irq_domain *d,
{
unsigned long ret = 0;
{
unsigned long ret = 0;
- if (
d->of_node
!= controller)
+ if (
irq_domain_get_of_node(d)
!= controller)
return -EINVAL;
if (intsize < 3)
return -EINVAL;
return -EINVAL;
if (intsize < 3)
return -EINVAL;