[PATCH 0/2] irqchip/gic-v3: Small cleanups for 4.4

[PATCH 0/2] irqchip/gic-v3: Small cleanups for 4.4

[Marc Zyngier]

Thomas, Jason,

I've been sitting on a couple of one-liners that affect GICv3. Nothing
dramatic (and certainly nothing that affects mainline today), but they
do get in the way of a KVM/ARM series that is aimed at 4.5 [1], and
I'd like to make sure we don't have too many ordering issues.

Alternatively, I can either carry these patches (with some Acks), or
rebase the KVM/ARM stuff on a stable branch (but that seems a bit
overkill for such a small set of changes).

Thanks,

	M.

[1] https://git.kernel.org/cgit/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/wsinc

Marc Zyngier (2):
  irqchip/gic-v3: Add missing struct device_node declaration
  irqchip/gic-v3: Add missing include for barrier.h

 arch/arm/include/asm/arch_gicv3.h   | 1 +
 arch/arm64/include/asm/arch_gicv3.h | 1 +
 include/linux/irqchip/arm-gic-v3.h  | 1 +
 3 files changed, 3 insertions(+)

-- 
2.1.4

[PATCH 1/2] irqchip/gic-v3: Add missing struct device_node declaration

[Marc Zyngier]

When the GICv3 header file is used in a C file that doesn't include
any of the OF stuff, we end up with a bunch of ugly warnings.

Let's keep GCC quiet by adding a forward declaration.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 include/linux/irqchip/arm-gic-v3.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index c9ae0c6..d5d798b 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -330,6 +330,7 @@ struct rdists {
 };
 
 struct irq_domain;
+struct device_node;
 int its_cpu_init(void);
 int its_init(struct device_node *node, struct rdists *rdists,
 	     struct irq_domain *domain);
-- 
2.1.4

[PATCH 2/2] irqchip/gic-v3: Add missing include for barrier.h

[Marc Zyngier]

Both the 32bit and 64bit versions of the GICv3 header file are using
barriers, but neglect to include barrier.h, leading to an interesting
splat in some circumstances.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm/include/asm/arch_gicv3.h   | 1 +
 arch/arm64/include/asm/arch_gicv3.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
index 6607d97..7da5503 100644
--- a/arch/arm/include/asm/arch_gicv3.h
+++ b/arch/arm/include/asm/arch_gicv3.h
@@ -21,6 +21,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/io.h>
+#include <asm/barrier.h>
 
 #define __ACCESS_CP15(CRn, Op1, CRm, Op2)	p15, Op1, %0, CRn, CRm, Op2
 #define __ACCESS_CP15_64(Op1, CRm)		p15, Op1, %Q0, %R0, CRm
diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h
index 030cdcb..2731d3b 100644
--- a/arch/arm64/include/asm/arch_gicv3.h
+++ b/arch/arm64/include/asm/arch_gicv3.h
@@ -77,6 +77,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/stringify.h>
+#include <asm/barrier.h>
 
 /*
  * Low-level accessors
-- 
2.1.4

[tip:irq/urgent] irqchip/gic-v3: Add missing struct device_node declaration

[tip-bot for Marc Zyngier]

Commit-ID:  059393c5bdd1420bdf1bed2972f33196dff263ae
Gitweb:     http://git.kernel.org/tip/059393c5bdd1420bdf1bed2972f33196dff263ae
Author:     Marc Zyngier <marc.zyngier@arm.com>
AuthorDate: Mon, 7 Dec 2015 10:11:11 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 10 Dec 2015 19:13:26 +0100

irqchip/gic-v3: Add missing struct device_node declaration

When the GICv3 header file is used in a C file that doesn't include
any of the OF stuff, we end up with a bunch of ugly warnings.

Let's keep GCC quiet by adding a forward declaration.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1449483072-17694-2-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 include/linux/irqchip/arm-gic-v3.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index c9ae0c6..d5d798b 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -330,6 +330,7 @@ struct rdists {
 };
 
 struct irq_domain;
+struct device_node;
 int its_cpu_init(void);
 int its_init(struct device_node *node, struct rdists *rdists,
 	     struct irq_domain *domain);

[tip:irq/urgent] irqchip/gic-v3: Add missing include for barrier.h

[tip-bot for Marc Zyngier]

Commit-ID:  8e31ed9c189788463c3b6c1f950cd90755f05f76
Gitweb:     http://git.kernel.org/tip/8e31ed9c189788463c3b6c1f950cd90755f05f76
Author:     Marc Zyngier <marc.zyngier@arm.com>
AuthorDate: Mon, 7 Dec 2015 10:11:12 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 10 Dec 2015 19:13:26 +0100

irqchip/gic-v3: Add missing include for barrier.h

Both the 32bit and 64bit versions of the GICv3 header file are using
barriers, but neglect to include barrier.h, leading to an interesting
splat in some circumstances.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1449483072-17694-3-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/arm/include/asm/arch_gicv3.h   | 1 +
 arch/arm64/include/asm/arch_gicv3.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
index 6607d97..7da5503 100644
--- a/arch/arm/include/asm/arch_gicv3.h
+++ b/arch/arm/include/asm/arch_gicv3.h
@@ -21,6 +21,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/io.h>
+#include <asm/barrier.h>
 
 #define __ACCESS_CP15(CRn, Op1, CRm, Op2)	p15, Op1, %0, CRn, CRm, Op2
 #define __ACCESS_CP15_64(Op1, CRm)		p15, Op1, %Q0, %R0, CRm
diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h
index 030cdcb..2731d3b 100644
--- a/arch/arm64/include/asm/arch_gicv3.h
+++ b/arch/arm64/include/asm/arch_gicv3.h
@@ -77,6 +77,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/stringify.h>
+#include <asm/barrier.h>
 
 /*
  * Low-level accessors