From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/9] irqchip/gic-v2: Gather ACPI specific data in a single structure
Date: Tue, 8 Mar 2016 21:47:10 -0800 [thread overview]
Message-ID: <20160309054710.GI26583@lvm> (raw)
In-Reply-To: <1457436573-6180-4-git-send-email-julien.grall@arm.com>
On Tue, Mar 08, 2016 at 11:29:27AM +0000, Julien Grall wrote:
> For now, there is only one member. More member will be added later.
questionable commit message
>
> 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 8f9ebf7..fbde202 100644
> --- a/drivers/irqchip/irq-gic.c
> +++ b/drivers/irqchip/irq-gic.c
> @@ -1245,7 +1245,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,
> @@ -1265,10 +1268,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;
> }
> @@ -1316,7 +1319,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
>
super nit: I would use cpu_phys_base instead of cpu_phy_base, but I'll
leave it up to you.
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
next prev parent reply other threads:[~2016-03-09 5:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 11:29 [PATCH v3 0/9] arm64: Add support of KVM with ACPI Julien Grall
2016-03-08 11:29 ` [PATCH v3 1/9] clocksource: arm_arch_timer: Gather KVM specific information in a structure Julien Grall
2016-03-09 3:23 ` Christoffer Dall
2016-03-09 5:35 ` Julien Grall
2016-03-08 11:29 ` [PATCH v3 2/9] clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get the virtual IRQ Julien Grall
2016-03-09 3:27 ` Christoffer Dall
2016-03-09 5:52 ` Julien Grall
2016-03-08 11:29 ` [PATCH v3 3/9] irqchip/gic-v2: Gather ACPI specific data in a single structure Julien Grall
2016-03-09 5:47 ` Christoffer Dall [this message]
2016-03-09 6:18 ` Julien Grall
2016-03-13 18:19 ` Christoffer Dall
2016-03-08 11:29 ` [PATCH v3 4/9] irqchip/gic-v2: Parse and export virtual GIC information Julien Grall
2016-03-09 5:14 ` Christoffer Dall
2016-03-14 12:19 ` Julien Grall
2016-03-08 11:29 ` [PATCH v3 5/9] irqchip/gic-v3: Gather all ACPI specific data in a single structure Julien Grall
2016-03-09 5:39 ` Christoffer Dall
2016-03-15 12:26 ` Julien Grall
2016-03-18 9:42 ` Christoffer Dall
2016-03-08 11:29 ` [PATCH v3 6/9] irqchip/gic-v3: Parse and export virtual GIC information Julien Grall
2016-03-09 5:53 ` Christoffer Dall
2016-03-22 11:27 ` Graeme Gregory
2016-03-22 12:02 ` Julien Grall
2016-03-08 11:29 ` [PATCH v3 7/9] KVM: arm/arm64: arch_timer: Rely on the arch timer to parse the firmware tables Julien Grall
2016-03-09 5:55 ` Christoffer Dall
2016-03-08 11:29 ` [PATCH v3 8/9] KVM: arm/arm64: vgic: Rely on the GIC driver " Julien Grall
2016-03-09 6:02 ` Christoffer Dall
2016-03-08 11:29 ` [PATCH v3 9/9] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter Julien Grall
2016-03-09 6:02 ` Christoffer Dall
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=20160309054710.GI26583@lvm \
--to=christoffer.dall@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).