From: Julien Grall <julien.grall@arm.com>
To: kvmarm@lists.cs.columbia.edu
Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com,
fu.wei@linaro.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, wei@redhat.com,
al.stone@linaro.org, Julien Grall <julien.grall@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH v2 3/6] irqchip/gic-v2: Gather ACPI specific data in a single structure
Date: Thu, 11 Feb 2016 15:33:21 +0000 [thread overview]
Message-ID: <1455204804-31830-4-git-send-email-julien.grall@arm.com> (raw)
In-Reply-To: <1455204804-31830-1-git-send-email-julien.grall@arm.com>
For now, there is only one member. More member will be added later.
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Changes in v2:
- Patch added
---
drivers/irqchip/irq-gic.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 911758c..d6131c4 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1246,7 +1246,10 @@ IRQCHIP_DECLARE(pl390, "arm,pl390", gic_of_init);
#endif
#ifdef CONFIG_ACPI
-static phys_addr_t cpu_phy_base __initdata;
+static struct
+{
+ phys_addr_t cpu_phy_base;
+} acpi_data __initdata;
static int __init
gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
@@ -1266,10 +1269,10 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
* All CPU interface addresses have to be the same.
*/
gic_cpu_base = processor->base_address;
- if (cpu_base_assigned && gic_cpu_base != cpu_phy_base)
+ if (cpu_base_assigned && gic_cpu_base != acpi_data.cpu_phy_base)
return -EINVAL;
- cpu_phy_base = gic_cpu_base;
+ acpi_data.cpu_phy_base = gic_cpu_base;
cpu_base_assigned = 1;
return 0;
}
@@ -1317,7 +1320,7 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header,
return -EINVAL;
}
- cpu_base = ioremap(cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
+ cpu_base = ioremap(acpi_data.cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
if (!cpu_base) {
pr_err("Unable to map GICC registers\n");
return -ENOMEM;
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Julien Grall <julien.grall@arm.com>
To: kvmarm@lists.cs.columbia.edu
Cc: al.stone@linaro.org, kvm@vger.kernel.org, marc.zyngier@arm.com,
linux-kernel@vger.kernel.org, fu.wei@linaro.org,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH v2 3/6] irqchip/gic-v2: Gather ACPI specific data in a single structure
Date: Thu, 11 Feb 2016 15:33:21 +0000 [thread overview]
Message-ID: <1455204804-31830-4-git-send-email-julien.grall@arm.com> (raw)
In-Reply-To: <1455204804-31830-1-git-send-email-julien.grall@arm.com>
For now, there is only one member. More member will be added later.
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Changes in v2:
- Patch added
---
drivers/irqchip/irq-gic.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 911758c..d6131c4 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1246,7 +1246,10 @@ IRQCHIP_DECLARE(pl390, "arm,pl390", gic_of_init);
#endif
#ifdef CONFIG_ACPI
-static phys_addr_t cpu_phy_base __initdata;
+static struct
+{
+ phys_addr_t cpu_phy_base;
+} acpi_data __initdata;
static int __init
gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
@@ -1266,10 +1269,10 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
* All CPU interface addresses have to be the same.
*/
gic_cpu_base = processor->base_address;
- if (cpu_base_assigned && gic_cpu_base != cpu_phy_base)
+ if (cpu_base_assigned && gic_cpu_base != acpi_data.cpu_phy_base)
return -EINVAL;
- cpu_phy_base = gic_cpu_base;
+ acpi_data.cpu_phy_base = gic_cpu_base;
cpu_base_assigned = 1;
return 0;
}
@@ -1317,7 +1320,7 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header,
return -EINVAL;
}
- cpu_base = ioremap(cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
+ cpu_base = ioremap(acpi_data.cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
if (!cpu_base) {
pr_err("Unable to map GICC registers\n");
return -ENOMEM;
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: julien.grall@arm.com (Julien Grall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/6] irqchip/gic-v2: Gather ACPI specific data in a single structure
Date: Thu, 11 Feb 2016 15:33:21 +0000 [thread overview]
Message-ID: <1455204804-31830-4-git-send-email-julien.grall@arm.com> (raw)
In-Reply-To: <1455204804-31830-1-git-send-email-julien.grall@arm.com>
For now, there is only one member. More member will be added later.
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Changes in v2:
- Patch added
---
drivers/irqchip/irq-gic.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 911758c..d6131c4 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1246,7 +1246,10 @@ IRQCHIP_DECLARE(pl390, "arm,pl390", gic_of_init);
#endif
#ifdef CONFIG_ACPI
-static phys_addr_t cpu_phy_base __initdata;
+static struct
+{
+ phys_addr_t cpu_phy_base;
+} acpi_data __initdata;
static int __init
gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
@@ -1266,10 +1269,10 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
* All CPU interface addresses have to be the same.
*/
gic_cpu_base = processor->base_address;
- if (cpu_base_assigned && gic_cpu_base != cpu_phy_base)
+ if (cpu_base_assigned && gic_cpu_base != acpi_data.cpu_phy_base)
return -EINVAL;
- cpu_phy_base = gic_cpu_base;
+ acpi_data.cpu_phy_base = gic_cpu_base;
cpu_base_assigned = 1;
return 0;
}
@@ -1317,7 +1320,7 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header,
return -EINVAL;
}
- cpu_base = ioremap(cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
+ cpu_base = ioremap(acpi_data.cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
if (!cpu_base) {
pr_err("Unable to map GICC registers\n");
return -ENOMEM;
--
1.9.1
next prev parent reply other threads:[~2016-02-11 15:34 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 15:33 [PATCH v2 0/6] arm64: Add support of KVM with ACPI Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` [PATCH v2 1/6] KVM: arm/arm64: arch_timer: Gather KVM specific information in a structure Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-19 7:24 ` Wei Huang
2016-02-19 7:24 ` Wei Huang
2016-02-19 7:24 ` Wei Huang
2016-02-19 10:53 ` Julien Grall
2016-02-19 10:53 ` Julien Grall
2016-02-19 10:53 ` Julien Grall
2016-02-19 10:53 ` Julien Grall
2016-02-19 11:41 ` Julien Grall
2016-02-19 11:41 ` Julien Grall
2016-02-19 11:54 ` Marc Zyngier
2016-02-19 11:54 ` Marc Zyngier
2016-02-19 11:54 ` Marc Zyngier
2016-02-11 15:33 ` [PATCH v2 2/6] KVM: arm/arm64: arch_timer: Rely on the arch timer to parse the firmware tables Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-03-03 19:38 ` Christoffer Dall
2016-03-03 19:38 ` Christoffer Dall
2016-03-03 19:38 ` Christoffer Dall
2016-03-04 10:32 ` Julien Grall
2016-03-04 10:32 ` Julien Grall
2016-02-11 15:33 ` Julien Grall [this message]
2016-02-11 15:33 ` [PATCH v2 3/6] irqchip/gic-v2: Gather ACPI specific data in a single structure Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` [PATCH v2 4/6] irqchip/gic-v2: Parse and export virtual GIC information Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` [PATCH v2 5/6] irqchip/gic-v3: " Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` [PATCH v2 6/6] KVM: arm/arm64: vgic: Rely on the GIC driver to parse the firmware tables Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-11 15:33 ` Julien Grall
2016-02-19 6:36 ` [PATCH v2 0/6] arm64: Add support of KVM with ACPI Wei Huang
2016-02-19 6:36 ` Wei Huang
2016-02-19 6:36 ` Wei Huang
2016-02-23 2:31 ` Huang Shijie
2016-02-23 2:31 ` Huang Shijie
2016-02-23 2:31 ` Huang Shijie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455204804-31830-4-git-send-email-julien.grall@arm.com \
--to=julien.grall@arm.com \
--cc=al.stone@linaro.org \
--cc=christoffer.dall@linaro.org \
--cc=fu.wei@linaro.org \
--cc=jason@lakedaemon.net \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=tglx@linutronix.de \
--cc=wei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.